diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-08-23 18:39:44 -0600 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-08-23 18:39:44 -0600 |
commit | 85dc437da27417cce05b5a9f97505b43cfdf4dee (patch) | |
tree | 3b6984e9f42a085fae821d4024326987a48fdc98 /framework/src | |
parent | 25b4f6e2d7ed2d783b8ee1eefbe62df713ca0341 (diff) | |
download | kube-85dc437da27417cce05b5a9f97505b43cfdf4dee.tar.gz kube-85dc437da27417cce05b5a9f97505b43cfdf4dee.zip |
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.
Diffstat (limited to 'framework/src')
-rw-r--r-- | framework/src/CMakeLists.txt | 1 | ||||
-rw-r--r-- | framework/src/domain/mime/mimetreeparser/CMakeLists.txt | 5 | ||||
-rw-r--r-- | framework/src/domain/mime/tests/CMakeLists.txt | 1 | ||||
-rw-r--r-- | framework/src/domain/settings/CMakeLists.txt | 1 |
4 files changed, 2 insertions, 6 deletions
diff --git a/framework/src/CMakeLists.txt b/framework/src/CMakeLists.txt index 1ac9d3c2..a22e8c06 100644 --- a/framework/src/CMakeLists.txt +++ b/framework/src/CMakeLists.txt | |||
@@ -9,6 +9,7 @@ find_package(KF5Package CONFIG REQUIRED) | |||
9 | find_package(KF5Contacts CONFIG REQUIRED) | 9 | find_package(KF5Contacts CONFIG REQUIRED) |
10 | 10 | ||
11 | add_definitions("-Wall -std=c++0x -g") | 11 | add_definitions("-Wall -std=c++0x -g") |
12 | set(CMAKE_CXX_VISIBILITY_PRESET default) | ||
12 | 13 | ||
13 | include_directories(. domain/mime/mimetreeparser domain/ domain/mime) | 14 | include_directories(. domain/mime/mimetreeparser domain/ domain/mime) |
14 | 15 | ||
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 @@ | |||
1 | add_definitions("-fvisibility=default") | 1 | set(CMAKE_CXX_VISIBILITY_PRESET default) |
2 | 2 | ||
3 | find_package(Qt5 COMPONENTS REQUIRED Core Gui) | 3 | find_package(Qt5 COMPONENTS REQUIRED Core Gui) |
4 | find_package(KF5Mime "4.87.0" CONFIG REQUIRED) | 4 | find_package(KF5Mime "4.87.0" CONFIG REQUIRED) |
5 | find_package(QGpgme CONFIG REQUIRED) | 5 | find_package(QGpgme CONFIG REQUIRED) |
6 | find_package(KF5Codecs CONFIG REQUIRED) | 6 | find_package(KF5Codecs CONFIG REQUIRED) |
7 | find_package(ECM 1.0.0 REQUIRED NO_MODULE) | ||
8 | set(CMAKE_MODULE_PATH | 7 | set(CMAKE_MODULE_PATH |
9 | ${ECM_MODULE_PATH} | 8 | ${ECM_MODULE_PATH} |
10 | ${CMAKE_CURRENT_SOURCE_DIR} | 9 | ${CMAKE_CURRENT_SOURCE_DIR} |
11 | ${CMAKE_MODULE_PATH}) | 10 | ${CMAKE_MODULE_PATH}) |
12 | 11 | ||
13 | #add_definitions(-DTRANSLATION_DOMAIN=\"libmimetreeparser\") | ||
14 | |||
15 | # target_include_directories does not handle empty include paths | 12 | # target_include_directories does not handle empty include paths |
16 | include_directories(${GPGME_INCLUDES}) | 13 | include_directories(${GPGME_INCLUDES}) |
17 | 14 | ||
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( | |||
5 | ${CMAKE_CURRENT_SOURCE_DIR}/.. | 5 | ${CMAKE_CURRENT_SOURCE_DIR}/.. |
6 | ) | 6 | ) |
7 | 7 | ||
8 | include(ECMAddTests) | ||
9 | find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Test WebEngine) | 8 | find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Test WebEngine) |
10 | 9 | ||
11 | include( ${CMAKE_SOURCE_DIR}/cmake/modules/add_gpg_crypto_test.cmake ) | 10 | 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 @@ | |||
1 | include_directories(${CMAKE_CURRENT_BINARY_DIR}) | 1 | include_directories(${CMAKE_CURRENT_BINARY_DIR}) |
2 | cmake_policy(SET CMP0063 NEW) | ||
3 | add_executable(sinkactiontest sinkactiontest.cpp) | 2 | add_executable(sinkactiontest sinkactiontest.cpp) |
4 | add_test(sinkactiontest sinkactiontest) | 3 | add_test(sinkactiontest sinkactiontest) |
5 | target_link_libraries(sinkactiontest | 4 | target_link_libraries(sinkactiontest |