diff options
| author | saturneric <[email protected]> | 2024-04-28 13:35:39 +0000 |
|---|---|---|
| committer | saturneric <[email protected]> | 2024-04-28 13:35:39 +0000 |
| commit | 0713999b4900a2b4ae3bd139e488d5ae0b507e4a (patch) | |
| tree | 48a6ccf1b61f85d2ef3400b68b353853eec7680f /CMakeLists.txt | |
| parent | Merge branch 'dev/2.1.2/module' into develop (diff) | |
| download | GpgFrontend-0713999b4900a2b4ae3bd139e488d5ae0b507e4a.tar.gz GpgFrontend-0713999b4900a2b4ae3bd139e488d5ae0b507e4a.zip | |
fix: solve macOS auto-build issues
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cebfa67b..f8207965 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,7 +66,6 @@ option(GPGFRONTEND_BUILD_TYPE_STABLE "Generate release version" ON) option(GPGFRONTEND_QT5_BUILD "Swith to Qt5 building mode" OFF) option(GPGFRONTEND_GENERATE_LINUX_INSTALL_SOFTWARE "Generate an installable version" OFF) -option(GPGFRONTEND_CONFIGURE_FOR_XCODE_BUILD "Generate a version that can be successfully compiled and packaged in Xcode" OFF) option(GPGFRONTEND_XCODE_TEAM_ID "GpgFrontend Apple Team ID" "NONE") option(GPGFRONTEND_XOCDE_CODE_SIGN_IDENTITY "GpgFrontend Signing Certificate" "NONE") option(GPGFRONTEND_XOCDE_APPID "GpgFrontend Apple AppID" "NONE") @@ -118,21 +117,6 @@ if (GPGFRONTEND_GENERATE_LINUX_INSTALL_SOFTWARE) set(LINUX_INSTALL_SOFTWARE 1) endif () -# xcode archive build -if (GPGFRONTEND_CONFIGURE_FOR_XCODE_BUILD) - set(GPGFRONTEND_GENERATE_LINUX_INSTALL_SOFTWARE 0) - set(LINUX_INSTALL_SOFTWARE 0) - set(XCODE_BUILD 1) - - set(GPGFRONTEND_BUILD_TYPE_TEST_CORE 0) - set(GPGFRONTEND_BUILD_TYPE_TEST_CORE_AND_COVERAGE 0) - set(GPGFRONTEND_BUILD_TYPE_TEST_UI 0) - set(GPGFRONTEND_BUILD_TYPE_TEST_ALL 0) - - unset(GPGFRONTEND_BUILD_CONFIG) - set(STABLE_BUILD_APPLICATION 1) -endif () - # C++ # options for ccache @@ -191,6 +175,21 @@ else() add_compile_definitions(DEBUG) endif() +# use xcode archive build at macos release at default +if (CMAKE_BUILD_TYPE STREQUAL "Release" AND APPLE) + set(GPGFRONTEND_GENERATE_LINUX_INSTALL_SOFTWARE 0) + set(LINUX_INSTALL_SOFTWARE 0) + set(XCODE_BUILD 1) + + set(GPGFRONTEND_BUILD_TYPE_TEST_CORE 0) + set(GPGFRONTEND_BUILD_TYPE_TEST_CORE_AND_COVERAGE 0) + set(GPGFRONTEND_BUILD_TYPE_TEST_UI 0) + set(GPGFRONTEND_BUILD_TYPE_TEST_ALL 0) + + unset(GPGFRONTEND_BUILD_CONFIG) + set(STABLE_BUILD_APPLICATION 1) +endif () + # Specify compilation mode message(STATUS "Switch Build Configure STABLE_BUILD_APPLICATION") |