diff options
| author | Manuel Nickschas <sputnick@quassel-irc.org> | 2008-11-18 12:10:44 +0000 |
|---|---|---|
| committer | Manuel Nickschas <sputnick@quassel-irc.org> | 2008-11-18 12:10:44 +0000 |
| commit | fc5cadc93a7d0191e6653fcf5bc502b7c1d22f6d (patch) | |
| tree | 83e2822776ee44a492f97d322d0690e48593b37f | |
| parent | 68c96bf5f6b6571f22a874ecdcf236bed465dc2a (diff) | |
| download | extra-cmake-modules-fc5cadc93a7d0191e6653fcf5bc502b7c1d22f6d.tar.gz extra-cmake-modules-fc5cadc93a7d0191e6653fcf5bc502b7c1d22f6d.tar.bz2 | |
Fixing FindQCA2.cmake based on suggestions by Alex Neundorf.
This should now provide absolute library paths and fix the problems various packages
had with building QCA2 support.
svn path=/trunk/KDE/kdelibs/; revision=885998
| -rw-r--r-- | modules/FindQCA2.cmake | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/modules/FindQCA2.cmake b/modules/FindQCA2.cmake index a80469d2..4cee0676 100644 --- a/modules/FindQCA2.cmake +++ b/modules/FindQCA2.cmake @@ -26,24 +26,24 @@ else (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES) if (NOT WIN32) find_package(PkgConfig) - pkg_check_modules(QCA2 qca2) - - set(QCA2_DEFINITIONS ${QCA2_CFLAGS}) + pkg_check_modules(PC_QCA2 qca2) # 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}) + if(PC_QCA2_FOUND) + set(QCA2_DEFINITIONS ${PC_QCA2_CFLAGS}) + set(QCA2_INCLUDE_DIR ${PC_QCA2_INCLUDE_DIRS}) find_library(QCA2_LIBRARIES NAMES qca PATHS - ${QCA2_LIBRARY_DIRS} + ${PC_QCA2_LIBRARY_DIRS} NO_DEFAULT_PATH ) - else(QCA2_FOUND) + set(QCA2_LIBRARY_DIRS ${PC_QCA2_LIBRARY_DIRS}) + else(PC_QCA2_FOUND) find_library(QCA2_LIBRARIES NAMES qca ) find_path(QCA2_INCLUDE_DIR qca.h PATH_SUFFIXES QtCrypto) - endif(QCA2_FOUND) + endif(PC_QCA2_FOUND) else (NOT WIN32) find_library_with_debug(QCA2_LIBRARIES |