From c697dcbcb593ff00ce242df7de128ae634ffcb44 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 17 Jan 2020 13:52:05 +0300 Subject: [PATCH] Fix Windows build with DESKTOP_APP_SPECIAL_TARGET. --- variables.cmake | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/variables.cmake b/variables.cmake index adc73c5..7b418d5 100644 --- a/variables.cmake +++ b/variables.cmake @@ -5,10 +5,23 @@ # https://github.com/desktop-app/legal/blob/master/LEGAL option(DESKTOP_APP_DISABLE_CRASH_REPORTS "Disable crash report generation." OFF) -option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." OFF) option(DESKTOP_APP_LOTTIE_USE_CACHE "Use caching in lottie animations." ON) + option(DESKTOP_APP_USE_GLIBC_WRAPS "Use wraps for new GLIBC features." OFF) +if (LINUX AND NOT DESKTOP_APP_SPECIAL_TARGET STREQUAL "") + set(DESKTOP_APP_USE_GLIBC_WRAPS ON) +endif() + option(DESKTOP_APP_USE_PACKAGED "Find libraries using CMake instead of exact paths." ON) +if (NOT DESKTOP_APP_SPECIAL_TARGET STREQUAL "") + set(DESKTOP_APP_USE_PACKAGED OFF) +endif() + +option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." OFF) +if (DESKTOP_APP_SPECIAL_TARGET STREQUAL "osx") + set(DESKTOP_APP_DISABLE_SPELLCHECK ON) +endif() + option(DESKTOP_APP_USE_PACKAGED_RLOTTIE "Find rlottie using CMake instead of bundled one." ${DESKTOP_APP_USE_PACKAGED}) if (DESKTOP_APP_SPECIAL_TARGET STREQUAL "" @@ -17,15 +30,6 @@ if (DESKTOP_APP_SPECIAL_TARGET STREQUAL "" set(disable_autoupdate 1) endif() -if (NOT DESKTOP_APP_SPECIAL_TARGET STREQUAL "") - set(DESKTOP_APP_USE_GLIBC_WRAPS ON) - set(DESKTOP_APP_USE_PACKAGED OFF) -endif() - -if (DESKTOP_APP_SPECIAL_TARGET STREQUAL "osx") - set(DESKTOP_APP_DISABLE_SPELLCHECK ON) -endif() - set(build_osx 0) set(build_macstore 0) set(build_winstore 0) @@ -35,14 +39,12 @@ if (WIN32) if (DESKTOP_APP_SPECIAL_TARGET STREQUAL "uwp") set(build_winstore 1) endif() - set(DESKTOP_APP_USE_GLIBC_WRAPS OFF) elseif (APPLE) if (DESKTOP_APP_SPECIAL_TARGET STREQUAL "osx") set(build_osx 1) elseif (DESKTOP_APP_SPECIAL_TARGET STREQUAL "mas") set(build_macstore 1) endif() - set(DESKTOP_APP_USE_GLIBC_WRAPS OFF) else() set(LINUX 1) execute_process(COMMAND uname -m OUTPUT_VARIABLE machine_uname)