From b02fc90612b3a22525e47ad4c404a7e432b6803f Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 11 Aug 2021 06:23:04 +0400 Subject: [PATCH] Get rid of osx and linux32 special targets --- external/auto_updates/xz/CMakeLists.txt | 11 +------ external/iconv/CMakeLists.txt | 7 +---- external/jpeg/CMakeLists.txt | 4 +-- external/openal/CMakeLists.txt | 2 +- external/opus/CMakeLists.txt | 10 +------ external/qt/CMakeLists.txt | 37 +++++++----------------- external/qt/package.cmake | 6 +--- external/zlib/CMakeLists.txt | 4 +-- options_linux.cmake | 9 ++---- options_mac.cmake | 38 +++++++++---------------- validate_special_target.cmake | 6 ++-- variables.cmake | 32 ++------------------- 12 files changed, 38 insertions(+), 128 deletions(-) diff --git a/external/auto_updates/xz/CMakeLists.txt b/external/auto_updates/xz/CMakeLists.txt index ca9bdad..438dd15 100644 --- a/external/auto_updates/xz/CMakeLists.txt +++ b/external/auto_updates/xz/CMakeLists.txt @@ -10,7 +10,7 @@ add_library(desktop-app::external_xz ALIAS external_xz) if (DESKTOP_APP_USE_PACKAGED) find_package(LibLZMA REQUIRED) target_link_libraries(external_xz INTERFACE LibLZMA::LibLZMA) -elseif (APPLE AND NOT build_osx) +elseif (APPLE) target_include_directories(external_xz SYSTEM INTERFACE /usr/local/macos/include @@ -19,15 +19,6 @@ elseif (APPLE AND NOT build_osx) INTERFACE /usr/local/macos/lib/liblzma.a ) -elseif (APPLE) - target_include_directories(external_xz SYSTEM - INTERFACE - /usr/local/include - ) - target_link_libraries(external_xz - INTERFACE - /usr/local/lib/liblzma.a - ) else() target_link_static_libraries(external_xz INTERFACE diff --git a/external/iconv/CMakeLists.txt b/external/iconv/CMakeLists.txt index b0a5fa6..36245b1 100644 --- a/external/iconv/CMakeLists.txt +++ b/external/iconv/CMakeLists.txt @@ -10,14 +10,9 @@ add_library(desktop-app::external_iconv ALIAS external_iconv) if (APPLE AND DESKTOP_APP_USE_PACKAGED) find_package(Iconv REQUIRED) target_link_libraries(external_iconv INTERFACE Iconv::Iconv) -elseif (APPLE AND NOT build_osx) +elseif (APPLE) target_link_libraries(external_iconv INTERFACE /usr/local/macos/lib/libiconv.a ) -elseif (APPLE) - target_link_libraries(external_iconv - INTERFACE - /usr/local/lib/libiconv.a - ) endif() diff --git a/external/jpeg/CMakeLists.txt b/external/jpeg/CMakeLists.txt index 7cb228b..9cb5ff8 100644 --- a/external/jpeg/CMakeLists.txt +++ b/external/jpeg/CMakeLists.txt @@ -13,10 +13,8 @@ if (DESKTOP_APP_USE_PACKAGED) elseif (WIN32) target_include_directories(external_jpeg SYSTEM INTERFACE ${libs_loc}/mozjpeg) target_link_libraries(external_jpeg INTERFACE ${libs_loc}/mozjpeg/$,Debug,Release>/jpeg-static.lib) -elseif (APPLE AND NOT build_osx) - target_link_libraries(external_jpeg INTERFACE /usr/local/macos/lib/libjpeg.a) elseif (APPLE) - target_link_libraries(external_jpeg INTERFACE /usr/local/lib/libjpeg.a) + target_link_libraries(external_jpeg INTERFACE /usr/local/macos/lib/libjpeg.a) else() target_link_static_libraries(external_jpeg INTERFACE jpeg) endif() diff --git a/external/openal/CMakeLists.txt b/external/openal/CMakeLists.txt index f9a4055..483d905 100644 --- a/external/openal/CMakeLists.txt +++ b/external/openal/CMakeLists.txt @@ -27,7 +27,7 @@ elseif (WIN32) INTERFACE ${libs_loc}/openal-soft/build/$,Debug,RelWithDebInfo>/OpenAL32.lib ) -elseif(APPLE AND NOT build_osx) +elseif(APPLE) target_include_directories(external_openal SYSTEM INTERFACE /usr/local/macos/include diff --git a/external/opus/CMakeLists.txt b/external/opus/CMakeLists.txt index 83f7c06..4ad35f0 100644 --- a/external/opus/CMakeLists.txt +++ b/external/opus/CMakeLists.txt @@ -31,7 +31,7 @@ else() IMPORTED_LOCATION "${opus_lib_loc}/Release/opus.lib" IMPORTED_LOCATION_DEBUG "${opus_lib_loc}/Debug/opus.lib" ) - elseif (APPLE AND NOT build_osx) + elseif (APPLE) target_include_directories(external_opus SYSTEM INTERFACE /usr/local/macos/include/opus @@ -39,14 +39,6 @@ else() set_target_properties(external_opus PROPERTIES IMPORTED_LOCATION /usr/local/macos/lib/libopus.a ) - elseif (APPLE) - target_include_directories(external_opus SYSTEM - INTERFACE - /usr/local/include/opus - ) - set_target_properties(external_opus PROPERTIES - IMPORTED_LOCATION /usr/local/lib/libopus.a - ) else() target_include_directories(external_opus SYSTEM INTERFACE diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt index 2635442..f54c3e9 100644 --- a/external/qt/CMakeLists.txt +++ b/external/qt/CMakeLists.txt @@ -163,33 +163,16 @@ else() desktop-app::external_angle ) elseif (APPLE) - if (NOT build_osx) - set(qt_libs - ${common_qt_libs} - lib/${qt_lib_prefix}Qt5Core - lib/${qt_lib_prefix}Qt5GraphicsSupport - lib/${qt_lib_prefix}Qt5ClipboardSupport - lib/${qt_lib_prefix}qtfreetype - lib/${qt_lib_prefix}qtpcre2 - plugins/platforms/${qt_lib_prefix}qcocoa - plugins/bearer/${qt_lib_prefix}qgenericbearer - ) - else() - set(qt_libs - lib/${qt_lib_prefix}Qt5PrintSupport - lib/${qt_lib_prefix}Qt5PlatformSupport - lib/${qt_lib_prefix}Qt5Network - lib/${qt_lib_prefix}Qt5Widgets - lib/${qt_lib_prefix}Qt5Gui - lib/${qt_lib_prefix}Qt5Core - lib/${qt_lib_prefix}qtharfbuzzng - lib/${qt_lib_prefix}qtfreetype - lib/${qt_lib_prefix}qtpcre - plugins/platforms/${qt_lib_prefix}qcocoa - plugins/imageformats/${qt_lib_prefix}qwebp - plugins/bearer/${qt_lib_prefix}qgenericbearer - ) - endif() + set(qt_libs + ${common_qt_libs} + lib/${qt_lib_prefix}Qt5Core + lib/${qt_lib_prefix}Qt5GraphicsSupport + lib/${qt_lib_prefix}Qt5ClipboardSupport + lib/${qt_lib_prefix}qtfreetype + lib/${qt_lib_prefix}qtpcre2 + plugins/platforms/${qt_lib_prefix}qcocoa + plugins/bearer/${qt_lib_prefix}qgenericbearer + ) foreach (lib ${qt_libs}) list(APPEND qt_libs_list "${qt_loc}/${lib}${qt_lib_suffix}") endforeach() diff --git a/external/qt/package.cmake b/external/qt/package.cmake index fedb6eb..3916ca4 100644 --- a/external/qt/package.cmake +++ b/external/qt/package.cmake @@ -5,11 +5,7 @@ # https://github.com/desktop-app/legal/blob/master/LEGAL if (NOT DESKTOP_APP_USE_PACKAGED) - if (NOT APPLE OR NOT build_osx) - set(qt_version 5.15.2) - else() - set(qt_version 5.6.2) - endif() + set(qt_version 5.15.2) if (WIN32) set(qt_loc ${libs_loc}/Qt-${qt_version}) diff --git a/external/zlib/CMakeLists.txt b/external/zlib/CMakeLists.txt index 2132ade..d5b1660 100644 --- a/external/zlib/CMakeLists.txt +++ b/external/zlib/CMakeLists.txt @@ -20,10 +20,8 @@ elseif (WIN32) endif() set(zlib_lib_loc ${libs_loc}/zlib/contrib/vstudio/vc14/${zlib_config_folder}/ZlibStat$,Debug,ReleaseWithoutAsm>) target_link_libraries(external_zlib INTERFACE ${zlib_lib_loc}/zlibstat.lib) -elseif (APPLE AND NOT build_osx) - target_link_libraries(external_zlib INTERFACE /usr/local/macos/lib/libz.a) elseif (APPLE) - target_link_libraries(external_zlib INTERFACE /usr/local/lib/libz.a) + target_link_libraries(external_zlib INTERFACE /usr/local/macos/lib/libz.a) else() target_link_libraries(external_zlib INTERFACE z) endif() diff --git a/options_linux.cmake b/options_linux.cmake index 73ce72a..f3569bd 100644 --- a/options_linux.cmake +++ b/options_linux.cmake @@ -36,13 +36,8 @@ if (DESKTOP_APP_SPECIAL_TARGET) $,,-Ofast> ) - if (build_linux32) - target_compile_options(common_options INTERFACE -g0) - target_link_options(common_options INTERFACE -g0) - else() - target_compile_options(common_options INTERFACE $,,-g -flto>) - target_link_options(common_options INTERFACE $,,-g -flto -fuse-linker-plugin>) - endif() + target_compile_options(common_options INTERFACE $,,-g -flto>) + target_link_options(common_options INTERFACE $,,-g -flto -fuse-linker-plugin>) endif() target_link_libraries(common_options diff --git a/options_mac.cmake b/options_mac.cmake index 3e872db..7f2944e 100644 --- a/options_mac.cmake +++ b/options_mac.cmake @@ -4,22 +4,18 @@ # For license and copyright information please follow this link: # https://github.com/desktop-app/legal/blob/master/LEGAL -if (build_osx) - target_compile_definitions(common_options INTERFACE OS_OSX) -else() - if (build_macstore) - target_compile_definitions(common_options - INTERFACE - OS_MAC_STORE - MAC_USE_BREAKPAD - ) - endif() - if (NOT DESKTOP_APP_USE_PACKAGED) - target_include_directories(common_options SYSTEM - INTERFACE - /usr/local/macos/include - ) - endif() +if (build_macstore) + target_compile_definitions(common_options + INTERFACE + OS_MAC_STORE + MAC_USE_BREAKPAD + ) +endif() +if (NOT DESKTOP_APP_USE_PACKAGED) + target_include_directories(common_options SYSTEM + INTERFACE + /usr/local/macos/include + ) endif() target_compile_options(common_options @@ -80,12 +76,6 @@ INTERFACE IOKit GSS MediaPlayer + IOSurface + Metal ) - -if (NOT build_osx) - target_link_frameworks(common_options - INTERFACE - IOSurface - Metal - ) -endif() diff --git a/validate_special_target.cmake b/validate_special_target.cmake index 97f61be..a00c713 100644 --- a/validate_special_target.cmake +++ b/validate_special_target.cmake @@ -26,15 +26,13 @@ if (WIN32) report_bad_special_target() endif() elseif (APPLE) - if (NOT DESKTOP_APP_SPECIAL_TARGET STREQUAL "osx" - AND NOT DESKTOP_APP_SPECIAL_TARGET STREQUAL "macstore" + if (NOT DESKTOP_APP_SPECIAL_TARGET STREQUAL "macstore" AND NOT DESKTOP_APP_SPECIAL_TARGET STREQUAL "mac") report_bad_special_target() endif() else() set(LINUX 1) - if (NOT DESKTOP_APP_SPECIAL_TARGET STREQUAL "linux" - AND NOT DESKTOP_APP_SPECIAL_TARGET STREQUAL "linux32") + if (NOT DESKTOP_APP_SPECIAL_TARGET STREQUAL "linux") report_bad_special_target() endif() endif() diff --git a/variables.cmake b/variables.cmake index d8e0a06..554ef40 100644 --- a/variables.cmake +++ b/variables.cmake @@ -9,16 +9,6 @@ if (DESKTOP_APP_SPECIAL_TARGET STREQUAL "") set(no_special_target 1) endif() -set(linux_special_target 0) -if (LINUX AND NOT DESKTOP_APP_SPECIAL_TARGET STREQUAL "") - set(linux_special_target 1) -endif() - -set(osx_special_target 0) -if (DESKTOP_APP_SPECIAL_TARGET STREQUAL "osx") - set(osx_special_target 1) -endif() - set(disable_autoupdate 0) if (DESKTOP_APP_SPECIAL_TARGET STREQUAL "" OR DESKTOP_APP_SPECIAL_TARGET STREQUAL "uwp" @@ -36,7 +26,7 @@ option(DESKTOP_APP_USE_ALLOCATION_TRACER "Use simple allocation tracer (Linux on option(DESKTOP_APP_USE_PACKAGED "Find libraries using CMake instead of exact paths." ${no_special_target}) option(DESKTOP_APP_USE_PACKAGED_LAZY "Bundle recommended Qt plugins for self-contained packages. (Linux only)" OFF) option(DESKTOP_APP_USE_PACKAGED_FFMPEG_STATIC "Link ffmpeg statically in packaged mode." OFF) -option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." ${osx_special_target}) +option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." OFF) option(DESKTOP_APP_DISABLE_WEBKITGTK "Disable WebKitGTK library (Linux only)." OFF) option(DESKTOP_APP_DISABLE_CRASH_REPORTS "Disable crash report generation." ${no_special_target}) option(DESKTOP_APP_DISABLE_AUTOUPDATE "Disable autoupdate." ${disable_autoupdate}) @@ -58,10 +48,8 @@ if ((WIN32 set(add_hunspell_library 1) endif() -set(build_osx 0) set(build_macstore 0) set(build_winstore 0) # 32 or 64 bit -set(build_linux32 0) set(build_win64 0) # normal or uwp set(build_winstore64 0) @@ -78,24 +66,10 @@ if (WIN32) set(build_win64 1) endif() elseif (APPLE) - if (DESKTOP_APP_SPECIAL_TARGET STREQUAL "osx") - set(build_osx 1) - elseif (DESKTOP_APP_SPECIAL_TARGET STREQUAL "macstore") + if (DESKTOP_APP_SPECIAL_TARGET STREQUAL "macstore") set(build_macstore 1) endif() else() - if (CMAKE_SIZEOF_VOID_P EQUAL 4) - set(build_linux32 1) - endif() - if (DESKTOP_APP_SPECIAL_TARGET STREQUAL "linux") - if (build_linux32) - report_bad_special_target() - endif() - elseif (DESKTOP_APP_SPECIAL_TARGET STREQUAL "linux32") - if (NOT build_linux32) - report_bad_special_target() - endif() - endif() if (DESKTOP_APP_SPECIAL_TARGET) if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set(CMAKE_AR "gcc-ar") @@ -111,7 +85,7 @@ endif() if (build_win64) get_filename_component(libs_loc "../Libraries/win64" REALPATH) -elseif (NOT APPLE OR build_osx) +elseif (NOT APPLE) get_filename_component(libs_loc "../Libraries" REALPATH) else() get_filename_component(libs_loc "../Libraries/macos" REALPATH)