summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOBATA Akio <obache@wizdas.com>2021-06-06 18:27:30 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2021-06-08 11:17:55 +0900
commit592f8bf1989ebf3b816be1bb50a0fbebc5289983 (patch)
treef63d37014826df4d1093e3880a543d8453b60080
parent4e06c4d3657a35b9afac3755f4d534b1cf47934c (diff)
downloadtdepim-592f8bf1989ebf3b816be1bb50a0fbebc5289983.tar.gz
tdepim-592f8bf1989ebf3b816be1bb50a0fbebc5289983.zip
Fix usage of GPGME_INCLUDE_DIRS
It is the semicolon separeted direcotory list, not for CXX_FLAGS. Signed-off-by: OBATA Akio <obache@wizdas.com> (cherry picked from commit a49bd18d7e06ce7ec0747d4a2a930dbc4bf94dff)
-rw-r--r--ConfigureChecks.cmake5
1 files changed, 4 insertions, 1 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index cfb6a8d7f..659ed0f92 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -144,10 +144,12 @@ if( BUILD_LIBTDENETWORK OR BUILD_CERTMANAGER OR BUILD_KMAIL OR BUILD_KADDRESSBOO
# check for various GPGME features
tde_save( CMAKE_CXX_FLAGS )
+ tde_save( CMAKE_REQUIRED_INCLUDES )
tde_save( CMAKE_REQUIRED_LIBRARIES )
string( REGEX REPLACE "-include tqt.h" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" )
# See FIXME above regarding -D_FILE_OFFSET_BITS=64
- set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GPGME_INCLUDE_DIRS} -D_FILE_OFFSET_BITS=64")
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FILE_OFFSET_BITS=64")
+ set( CMAKE_REQUIRED_INCLUDES "${GPGME_INCLUDE_DIRS}")
set( CMAKE_REQUIRED_LIBRARIES "${GPGME_LIBRARIES}")
# check for GPGME_KEYLIST_MODE_VALIDATE
@@ -206,6 +208,7 @@ if( BUILD_LIBTDENETWORK OR BUILD_CERTMANAGER OR BUILD_KMAIL OR BUILD_KADDRESSBOO
# done checking for GPGME features
tde_restore( CMAKE_CXX_FLAGS )
+ tde_restore( CMAKE_REQUIRED_INCLUDES )
tde_restore( CMAKE_REQUIRED_LIBRARIES )
endif( )