From 7ac1d3792224e6ad536231088a760b1b8f7ef1e9 Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Thu, 13 Nov 2008 22:23:31 +0000
Subject: -make it work also without pkgconfig

Alex



svn path=/trunk/KDE/kdelibs/; revision=883961
---
 modules/FindQCA2.cmake | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'modules/FindQCA2.cmake')

diff --git a/modules/FindQCA2.cmake b/modules/FindQCA2.cmake
index af34892b..fd081160 100644
--- a/modules/FindQCA2.cmake
+++ b/modules/FindQCA2.cmake
@@ -30,12 +30,21 @@ else (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES)
 
     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
-- 
cgit v1.2.1