summaryrefslogtreecommitdiffstats
path: root/framework/src
diff options
context:
space:
mode:
Diffstat (limited to 'framework/src')
-rw-r--r--framework/src/CMakeLists.txt1
-rw-r--r--framework/src/domain/mime/mimetreeparser/CMakeLists.txt5
-rw-r--r--framework/src/domain/mime/tests/CMakeLists.txt1
-rw-r--r--framework/src/domain/settings/CMakeLists.txt1
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)
9find_package(KF5Contacts CONFIG REQUIRED) 9find_package(KF5Contacts CONFIG REQUIRED)
10 10
11add_definitions("-Wall -std=c++0x -g") 11add_definitions("-Wall -std=c++0x -g")
12set(CMAKE_CXX_VISIBILITY_PRESET default)
12 13
13include_directories(. domain/mime/mimetreeparser domain/ domain/mime) 14include_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 @@
1add_definitions("-fvisibility=default") 1set(CMAKE_CXX_VISIBILITY_PRESET default)
2 2
3find_package(Qt5 COMPONENTS REQUIRED Core Gui) 3find_package(Qt5 COMPONENTS REQUIRED Core Gui)
4find_package(KF5Mime "4.87.0" CONFIG REQUIRED) 4find_package(KF5Mime "4.87.0" CONFIG REQUIRED)
5find_package(QGpgme CONFIG REQUIRED) 5find_package(QGpgme CONFIG REQUIRED)
6find_package(KF5Codecs CONFIG REQUIRED) 6find_package(KF5Codecs CONFIG REQUIRED)
7find_package(ECM 1.0.0 REQUIRED NO_MODULE)
8set(CMAKE_MODULE_PATH 7set(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
16include_directories(${GPGME_INCLUDES}) 13include_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
8include(ECMAddTests)
9find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Test WebEngine) 8find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Test WebEngine)
10 9
11include( ${CMAKE_SOURCE_DIR}/cmake/modules/add_gpg_crypto_test.cmake ) 10include( ${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 @@
1include_directories(${CMAKE_CURRENT_BINARY_DIR}) 1include_directories(${CMAKE_CURRENT_BINARY_DIR})
2cmake_policy(SET CMP0063 NEW)
3add_executable(sinkactiontest sinkactiontest.cpp) 2add_executable(sinkactiontest sinkactiontest.cpp)
4add_test(sinkactiontest sinkactiontest) 3add_test(sinkactiontest sinkactiontest)
5target_link_libraries(sinkactiontest 4target_link_libraries(sinkactiontest