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

List:       kde-commits
Subject:    KDE/kdelibs/cmake/modules
From:       Alexander Neundorf <neundorf () kde ! org>
Date:       2008-11-13 22:23:40
Message-ID: 1226615020.474365.15484.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 883961 by neundorf:

-make it work also without pkgconfig

Alex




 M  +15 -6     FindQCA2.cmake  


--- trunk/KDE/kdelibs/cmake/modules/FindQCA2.cmake #883960:883961
@@ -30,12 +30,21 @@
 
     set(QCA2_DEFINITIONS ${QCA2_CFLAGS})
 
-    FIND_LIBRARY(QCA2_LIBRARIES NAMES qca
-      PATHS
-      ${QCA2_LIBRARY_DIRS}
-      NO_DEFAULT_PATH
-    )
-    set(QCA2_INCLUDE_DIR ${QCA2_INCLUDEDIR})
+    # If pkgconfig found QCA2, get the full path to the library using find_library()
+    # but only in the path reported by pkgconfig.
+    # Otherwise do a normal search.
+    if(QCA2_FOUND)
+       set(QCA2_INCLUDE_DIR ${QCA2_INCLUDEDIR})
+       find_library(QCA2_LIBRARIES NAMES qca
+                    PATHS
+                    ${QCA2_LIBRARY_DIRS}
+                    NO_DEFAULT_PATH
+                    )
+    else(QCA2_FOUND)
+       find_library(QCA2_LIBRARIES NAMES qca )
+       find_path(QCA2_INCLUDE_DIR qca.h PATH_SUFFIXES QtCrypto)
+    endif(QCA2_FOUND)
+
   ELSE (NOT WIN32)
     FIND_LIBRARY_WITH_DEBUG(QCA2_LIBRARIES
                     WIN32_DEBUG_POSTFIX d
[prev in list] [next in list] [prev in thread] [next in thread]