summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Heinecke <aheinecke@intevation.de>2016-08-02 11:06:39 (GMT)
committerAndre Heinecke <aheinecke@intevation.de>2016-08-02 11:07:39 (GMT)
commit38f3fcf2d6c199e32153b2b9e69ff43c30d1da19 (patch)
tree7494a03661176ff6e23e940a883dd59f6beb39ad
parent33797271eb6697e8a081340222f70663a9097e29 (diff)
Include Assuan2 directly in Source
Even the very common classes like Input/Output already use kleo-assuan so we basically need to include the directory for assuan.h globally. Before removing the direct dependency to gpgme this was shadowed by the common case that assuan and gpgme shared the same include directory.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/libkleopatraclient/core/CMakeLists.txt6
2 files changed, 1 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 36598d2..277b8c8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -41,6 +41,7 @@ set(_kleopatra_uiserver_SRCS
if(ASSUAN2_FOUND)
set(_kleopatra_uiserver_extra_libs ${ASSUAN2_LIBRARIES})
+ include_directories(${ASSUAN2_INCLUDES})
else()
if(WIN32)
set(_kleopatra_uiserver_extra_libs ${ASSUAN_VANILLA_LIBRARIES})
diff --git a/src/libkleopatraclient/core/CMakeLists.txt b/src/libkleopatraclient/core/CMakeLists.txt
index 69ade28..266f992 100644
--- a/src/libkleopatraclient/core/CMakeLists.txt
+++ b/src/libkleopatraclient/core/CMakeLists.txt
@@ -1,9 +1,3 @@
-if(ASSUAN2_FOUND)
- include_directories(${ASSUAN2_INCLUDES})
-else()
- include_directories(${ASSUAN_INCLUDES})
-endif()
-
add_definitions(
-D_ASSUAN_ONLY_GPG_ERRORS
-DQT_NO_CAST_FROM_ASCII -DQT_NO_KEYWORDS -DQT_NO_CAST_TO_ASCII