From 85dc437da27417cce05b5a9f97505b43cfdf4dee Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Wed, 23 Aug 2017 18:39:44 -0600 Subject: The grand cmake cleanup We had a ton of duplication in our cmake code because we had no common toplevel settings. This is now cleaned up so we can sanely change settings and so we know what we have set. --- framework/src/domain/mime/mimetreeparser/CMakeLists.txt | 5 +---- framework/src/domain/mime/tests/CMakeLists.txt | 1 - framework/src/domain/settings/CMakeLists.txt | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) (limited to 'framework/src/domain') diff --git a/framework/src/domain/mime/mimetreeparser/CMakeLists.txt b/framework/src/domain/mime/mimetreeparser/CMakeLists.txt index 9f67d784..3cdbc173 100644 --- a/framework/src/domain/mime/mimetreeparser/CMakeLists.txt +++ b/framework/src/domain/mime/mimetreeparser/CMakeLists.txt @@ -1,17 +1,14 @@ -add_definitions("-fvisibility=default") +set(CMAKE_CXX_VISIBILITY_PRESET default) find_package(Qt5 COMPONENTS REQUIRED Core Gui) find_package(KF5Mime "4.87.0" CONFIG REQUIRED) find_package(QGpgme CONFIG REQUIRED) find_package(KF5Codecs CONFIG REQUIRED) -find_package(ECM 1.0.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MODULE_PATH}) -#add_definitions(-DTRANSLATION_DOMAIN=\"libmimetreeparser\") - # target_include_directories does not handle empty include paths include_directories(${GPGME_INCLUDES}) diff --git a/framework/src/domain/mime/tests/CMakeLists.txt b/framework/src/domain/mime/tests/CMakeLists.txt index f94447ff..2844d7ed 100644 --- a/framework/src/domain/mime/tests/CMakeLists.txt +++ b/framework/src/domain/mime/tests/CMakeLists.txt @@ -5,7 +5,6 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ) -include(ECMAddTests) find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Test WebEngine) include( ${CMAKE_SOURCE_DIR}/cmake/modules/add_gpg_crypto_test.cmake ) diff --git a/framework/src/domain/settings/CMakeLists.txt b/framework/src/domain/settings/CMakeLists.txt index e9ea76c6..1e218e97 100644 --- a/framework/src/domain/settings/CMakeLists.txt +++ b/framework/src/domain/settings/CMakeLists.txt @@ -1,5 +1,4 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) -cmake_policy(SET CMP0063 NEW) add_executable(sinkactiontest sinkactiontest.cpp) add_test(sinkactiontest sinkactiontest) target_link_libraries(sinkactiontest -- cgit v1.2.3