[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepimlibs
From:       Marc Mutz <mutz () kde ! org>
Date:       2007-07-23 17:27:40
Message-ID: 1185211660.427227.25027.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 691459 by mutz:

Fix HAVE_GPGME_CANCEL test - the ConfigureChecks.cmake file was included before \
find_package(Gpgme) was run, so the link step failed (HAVE_GPGME_CANCEL is the only \
one of the tests that checks for the presence of a function, the others check bits in \
a struct, so they link w/o -lgpgme

 M  +2 -1      CMakeLists.txt  


--- trunk/KDE/kdepimlibs/CMakeLists.txt #691458:691459
@@ -6,7 +6,6 @@
 find_package(KDE4 REQUIRED)
 include (KDE4Defaults)
 include (MacroLibrary)
-include (gpgme++/ConfigureChecks.cmake)
 
 #boost is a hard dependency
 find_package(Boost)
@@ -20,6 +19,8 @@
   find_package(Gpgme)
 endif(UNIX)
 
+include (gpgme++/ConfigureChecks.cmake)
+
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
 


[prev in list] [next in list] [prev in thread] [next in thread]