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

List:       kde-commits
Subject:    KDE/kdepimlibs/cmake/modules
From:       Marc Mutz <mutz () kde ! org>
Date:       2007-08-27 17:46:46
Message-ID: 1188236806.731224.10700.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 705305 by mutz:

Need to check for the return value of the script instead of for empty output, the \
usage isn't exactly a valid linker command line :)

 M  +16 -5     FindGpgme.cmake  


--- trunk/KDE/kdepimlibs/cmake/modules/FindGpgme.cmake #705304:705305
@@ -157,7 +157,7 @@
     # if gpgme-config has been found
     if ( _GPGMECONFIG_EXECUTABLE )
 
-      message( STATUS "Found gpgme-config" )
+      message( STATUS "Found gpgme-config at ${_GPGMECONFIG_EXECUTABLE}" )
 
       exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE \
GPGME_VERSION )  
@@ -170,12 +170,23 @@
 
       else()
 
-        message( STATUS "Found gpgme v${GPGME_VERSION}." )
+        message( STATUS "Found gpgme v${GPGME_VERSION}, checking for flavours..." )
 
-        exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS                  --libs \
                OUTPUT_VARIABLE GPGME_LIBRARIES         )
-        exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pthread --libs \
                OUTPUT_VARIABLE GPGME_PTHREAD_LIBRARIES )
-        exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pth     --libs \
OUTPUT_VARIABLE GPGME_PTH_LIBRARIES     ) +        exec_program( \
${_GPGMECONFIG_EXECUTABLE} ARGS                  --libs OUTPUT_VARIABLE \
GPGME_LIBRARIES         RETURN_VALUE _ret ) +	if ( _ret )
+	  set( GPGME_LIBRARIES "" )
+	endif()
 
+        exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pthread --libs \
OUTPUT_VARIABLE GPGME_PTHREAD_LIBRARIES RETURN_VALUE _ret ) +	if ( _ret )
+	  set( GPGME_PTHREAD_LIBRARIES "" )
+	endif()
+
+        exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pth     --libs \
OUTPUT_VARIABLE GPGME_PTH_LIBRARIES     RETURN_VALUE _ret ) +	if ( _ret )
+	  set( GPGME_PTH_LIBRARIES "" )
+	endif()
+
         # append -lgpg-error to the list of libraries, if necessary
         if ( GPGME_LIBRARIES AND NOT GPGME_LIBRARIES MATCHES "lgpg-error" )
           set( GPGME_LIBRARIES "${GPGME_LIBRARIES} -lgpg-error" )


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