From 0863078fae1f32104ccdadc080113f5537e045c8 Mon Sep 17 00:00:00 2001 From: saturneric Date: Sun, 15 Oct 2023 01:59:16 +0800 Subject: fix: slove build problem for flatpack builder --- CMakeLists.txt | 38 +++++++++----------------------------- 1 file changed, 9 insertions(+), 29 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index d6c7e2e3..74d1d0f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,13 +32,13 @@ project(GpgFrontend VERSION 2.1.1 LANGUAGES CXX) # show cmake version message(STATUS "GpgFrontend Build Configuration Started CMAKE Version ${CMAKE_VERSION}") -INCLUDE(CheckIncludeFiles) -INCLUDE(CheckIncludeFileCXX) -INCLUDE(CheckFunctionExists) -INCLUDE(CheckSymbolExists) -INCLUDE(CheckTypeSize) -INCLUDE(CheckLibraryExists) -INCLUDE(CheckCXXSourceCompiles) +include(CheckIncludeFiles) +include(CheckIncludeFileCXX) +include(CheckFunctionExists) +include(CheckSymbolExists) +include(CheckTypeSize) +include(CheckLibraryExists) +include(CheckCXXSourceCompiles) # generate compile_commands.json set(CMAKE_EXPORT_COMPILE_COMMANDS ON) @@ -383,7 +383,7 @@ endif () if (LINUX_INSTALL_SOFTWARE) - message(STATUS "Configure Linux Install ON") + message(STATUS "Linux Install Traget ${CMAKE_INSTALL_PREFIX}") include(GNUInstallDirs) set(INSTALL_GPGFRONTEND_APP 1) set(APP_INSTALL_FLAG LINUX_INSTALL) @@ -403,9 +403,6 @@ if (FULL_APPLICATION_BUILD) set(QT5_ENV_SUPPORT 1) set(GPG_CORE 1) set(UI_CORE 1) - set(SMTP_SUPPORT 1) - set(SERVER_SUPPORT 1) - set(ADVANCE_SUPPORT 1) set(APPLICATION_BUILD 1) set(BASIC_ENV_CONFIG 1) set(MULTI_LANG_SUPPORT 1) @@ -416,10 +413,6 @@ elseif (MINIMUM_APPLICATION_BUILD) set(UI_CORE 1) set(APPLICATION_BUILD 1) set(BASIC_ENV_CONFIG 1) - # Disable APP_IMAGE_UPDATE because of too many issues - # if (LINUX) - # set(APP_IMAGE_UPDATE 1) - # endif () elseif (STABLE_APPLICATION_BUILD) message(STATUS "Build Stable Application") set(QT5_ENV_SUPPORT 1) @@ -427,7 +420,6 @@ elseif (STABLE_APPLICATION_BUILD) set(UI_CORE 1) set(APPLICATION_BUILD 1) set(BASIC_ENV_CONFIG 1) - set(SMTP_SUPPORT 1) set(MULTI_LANG_SUPPORT 1) elseif (TEST_CORE_BUILD) message(STATUS "Build Test Cases") @@ -443,19 +435,7 @@ endif () # For instance in order to select the highest version one SET(CMAKE_FIND_PACKAGE_SORT_ORDER NATURAL) SET(CMAKE_FIND_PACKAGE_SORT_DIRECTION DEC) - -if (SMTP_SUPPORT) - add_compile_definitions(SMTP_SUPPORT) -endif () - -if (SERVER_SUPPORT) - add_compile_definitions(SERVER_SUPPORT) -endif () - -if (ADVANCE_SUPPORT) - add_compile_definitions(ADVANCE_SUPPORT) -endif () - +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) if (MULTI_LANG_SUPPORT) add_compile_definitions(MULTI_LANG_SUPPORT) -- cgit v1.2.3