diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-05-03 17:17:51 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-05-03 17:17:51 +0200 |
commit | 6ad06bafded0b0a1c7fae45b4d1b90b00216f201 (patch) | |
tree | 72329e48284cc4175e0b08fc3d45258f321ad18e | |
parent | dbc67691b5f359dba98531f0e5515812902dd154 (diff) | |
download | kube-6ad06bafded0b0a1c7fae45b4d1b90b00216f201.tar.gz kube-6ad06bafded0b0a1c7fae45b4d1b90b00216f201.zip |
cmake cleanup
-rw-r--r-- | framework/CMakeLists.txt | 6 | ||||
-rw-r--r-- | framework/src/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt index af456384..e7c14880 100644 --- a/framework/CMakeLists.txt +++ b/framework/CMakeLists.txt | |||
@@ -1,7 +1,3 @@ | |||
1 | include(GenerateExportHeader) | ||
2 | include(ECMGenerateHeaders) | ||
3 | include(CMakePackageConfigHelpers) | ||
4 | |||
5 | set(FRAMEWORK_INSTALL_DIR ${QML_INSTALL_DIR}/org/kube/framework) | 1 | set(FRAMEWORK_INSTALL_DIR ${QML_INSTALL_DIR}/org/kube/framework) |
6 | 2 | ||
7 | install(DIRECTORY qml/ DESTINATION ${FRAMEWORK_INSTALL_DIR}) | 3 | install(DIRECTORY qml/ DESTINATION ${FRAMEWORK_INSTALL_DIR}) |
@@ -9,5 +5,3 @@ install(FILES qmldir DESTINATION ${FRAMEWORK_INSTALL_DIR}) | |||
9 | 5 | ||
10 | add_subdirectory(src) | 6 | add_subdirectory(src) |
11 | add_subdirectory(qml/tests) | 7 | add_subdirectory(qml/tests) |
12 | |||
13 | feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) | ||
diff --git a/framework/src/CMakeLists.txt b/framework/src/CMakeLists.txt index 78d4ed05..44d58796 100644 --- a/framework/src/CMakeLists.txt +++ b/framework/src/CMakeLists.txt | |||
@@ -9,6 +9,8 @@ find_package(Gpgmepp CONFIG REQUIRED) | |||
9 | find_package(KF5Codecs CONFIG REQUIRED) | 9 | find_package(KF5Codecs CONFIG REQUIRED) |
10 | find_package(KF5Contacts CONFIG REQUIRED) | 10 | find_package(KF5Contacts CONFIG REQUIRED) |
11 | 11 | ||
12 | include(GenerateExportHeader) | ||
13 | |||
12 | set(CMAKE_CXX_VISIBILITY_PRESET default) | 14 | set(CMAKE_CXX_VISIBILITY_PRESET default) |
13 | set(CMAKE_CXX_STANDARD_REQUIRED 14) | 15 | set(CMAKE_CXX_STANDARD_REQUIRED 14) |
14 | 16 | ||