From 592f8bf1989ebf3b816be1bb50a0fbebc5289983 Mon Sep 17 00:00:00 2001 From: OBATA Akio Date: Sun, 6 Jun 2021 18:27:30 +0900 Subject: Fix usage of GPGME_INCLUDE_DIRS It is the semicolon separeted direcotory list, not for CXX_FLAGS. Signed-off-by: OBATA Akio (cherry picked from commit a49bd18d7e06ce7ec0747d4a2a930dbc4bf94dff) --- ConfigureChecks.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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( ) -- cgit v1.2.1