1
0
Fork 0

Replace DESKTOP_APP_USE_PACKAGED with DESKTOP_APP_SPECIAL_TARGET in some places

This commit is contained in:
Ilya Fedin 2020-08-07 13:27:35 +04:00 committed by John Preston
parent 2d6b9aeab5
commit f05e28c8da
3 changed files with 4 additions and 4 deletions

View file

@ -39,7 +39,7 @@ function(init_target target_name) # init_target(my_target folder_name)
XCODE_ATTRIBUTE_GCC_INLINES_ARE_PRIVATE_EXTERN YES
XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN YES
)
if (NOT DESKTOP_APP_USE_PACKAGED)
if (DESKTOP_APP_SPECIAL_TARGET)
set_target_properties(${target_name} PROPERTIES
XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL $<IF:$<CONFIG:Debug>,0,fast>
XCODE_ATTRIBUTE_LLVM_LTO $<IF:$<CONFIG:Debug>,NO,YES>

View file

@ -26,7 +26,7 @@ INTERFACE
-Wno-error=class-memaccess
)
if (NOT DESKTOP_APP_USE_PACKAGED)
if (DESKTOP_APP_SPECIAL_TARGET)
target_compile_options(common_options
INTERFACE
$<IF:$<CONFIG:Debug>,,-Ofast>

View file

@ -26,7 +26,7 @@ option(DESKTOP_APP_USE_PACKAGED "Find libraries using CMake instead of exact pat
option(DESKTOP_APP_USE_PACKAGED_LAZY "Bundle recommended Qt plugins for self-contained packages. (Linux only)" OFF)
option(DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES "Bundle recommended Qt platform themes for self-contained packages. (Linux only)" ${DESKTOP_APP_USE_PACKAGED_LAZY})
option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." ${osx_special_target})
option(DESKTOP_APP_DISABLE_CRASH_REPORTS "Disable crash report generation." ${DESKTOP_APP_USE_PACKAGED})
option(DESKTOP_APP_DISABLE_CRASH_REPORTS "Disable crash report generation." ${no_special_target})
option(DESKTOP_APP_USE_PACKAGED_FFMPEG_STATIC "Link found ffmpeg statically." OFF)
option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundled Hunspell only. (For debugging purposes)" OFF)
option(DESKTOP_APP_USE_ENCHANT "Use Enchant instead of bundled Hunspell. (Linux only)" OFF)
@ -87,7 +87,7 @@ else()
report_bad_special_target()
endif()
endif()
if (NOT DESKTOP_APP_USE_PACKAGED OR DESKTOP_APP_ENABLE_IPO_OPTIMIZATIONS)
if (DESKTOP_APP_SPECIAL_TARGET OR DESKTOP_APP_ENABLE_IPO_OPTIMIZATIONS)
set(CMAKE_AR "gcc-ar")
set(CMAKE_RANLIB "gcc-ranlib")
set(CMAKE_NM "gcc-nm")