diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-09-07 05:46:14 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-09-07 05:46:14 +0000 |
| commit | 3bbd9f8c37af59661292e14ec82088ffb09195e2 (patch) | |
| tree | c379d68f0bb43dda07c1f0a3e99a809e7faf7096 | |
| parent | 834036fae64cdc9fc8adb947861d2d8c926775a8 (diff) | |
| download | tdepim-3bbd9f8c37af59661292e14ec82088ffb09195e2.tar.gz tdepim-3bbd9f8c37af59661292e14ec82088ffb09195e2.zip | |
Fix kdepim FTBFS under Ubuntu Natty
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1251915 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | ConfigureChecks.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 46dd4f28c..e0b3f928c 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -118,8 +118,12 @@ if( BUILD_LIBKDENETWORK OR BUILD_CERTMANAGER OR BUILD_KMAIL OR BUILD_KADDRESSBOO if( GPGERR_LIBRARIES ) string( REGEX REPLACE "(^| )-l" ";" GPGERR_LIBRARIES "${GPGERR_LIBRARIES}" ) endif( ) - set( GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS}${GPGERR_INCLUDE_DIRS}" CACHE INTERNAL "" FORCE ) - set( GPGME_LIBRARIES "${GPGME_LIBRARIES}${GPGERR_LIBRARIES}" CACHE INTERNAL "" FORCE ) + set( GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS} ${GPGERR_INCLUDE_DIRS}" CACHE INTERNAL "" FORCE ) + set( GPGME_LIBRARIES "${GPGME_LIBRARIES} ${GPGERR_LIBRARIES}" CACHE INTERNAL "" FORCE ) + string( REGEX REPLACE " ;" ";" GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS}" ) + string( REGEX REPLACE " ;" ";" GPGME_LIBRARIES "${GPGME_LIBRARIES}" ) + set( GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS}" CACHE INTERNAL "" FORCE ) + set( GPGME_LIBRARIES "${GPGME_LIBRARIES}" CACHE INTERNAL "" FORCE ) # assuming that all newer system have gpgme >= 0.4 set( HAVE_GPGME_0_4_BRANCH 1 CACHE INTERNAL "" ) |