diff options
| author | Brad Hards <bradh@frogmouth.net> | 2007-01-16 07:04:10 +0000 |
|---|---|---|
| committer | Brad Hards <bradh@frogmouth.net> | 2007-01-16 07:04:10 +0000 |
| commit | 8bbf6337b49f1c71efa332f671725e0ec0c6c2f8 (patch) | |
| tree | 884c481673d8607f61e1bef0498060961b3de791 | |
| parent | 6b8bf982f6253e457e4a60060bb0acd279164e1b (diff) | |
| download | extra-cmake-modules-8bbf6337b49f1c71efa332f671725e0ec0c6c2f8.tar.gz extra-cmake-modules-8bbf6337b49f1c71efa332f671725e0ec0c6c2f8.tar.bz2 | |
Fix a problem experienced by a few people, where the
QCA2 cmake module threw away the pkg-config output, and
returned the path to the QtCrypto directory, instead
of the path to the <QtCrypto> include (typically one
level down).
svn path=/trunk/KDE/kdelibs/; revision=624040
| -rw-r--r-- | modules/FindQCA2.cmake | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/modules/FindQCA2.cmake b/modules/FindQCA2.cmake index d302a186..d671422f 100644 --- a/modules/FindQCA2.cmake +++ b/modules/FindQCA2.cmake @@ -24,15 +24,16 @@ else (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES) INCLUDE(UsePkgConfig) IF (NOT WIN32) - PKGCONFIG(qca _Qca2IncDir _Qca2LinkDir _Qca2LinkFlags _Qca2Cflags) + PKGCONFIG(qca QCA2_INCLUDE_DIR _Qca2LinkDir _Qca2LinkFlags _Qca2Cflags) set(QCA2_DEFINITIONS ${_Qca2Cflags}) - ENDIF (NOT WIN32) + ELSE (NOT WIN32) - FIND_PATH(QCA2_INCLUDE_DIR QtCrypto - PATHS - ${_Qca2IncDir} - ) + FIND_PATH(QCA2_INCLUDE_DIR QtCrypto + PATHS + ${_Qca2IncDir} + ) + ENDIF (NOT WIN32) FIND_LIBRARY(QCA2_LIBRARIES NAMES qca PATHS |