From 8bbf6337b49f1c71efa332f671725e0ec0c6c2f8 Mon Sep 17 00:00:00 2001 From: Brad Hards Date: Tue, 16 Jan 2007 07:04:10 +0000 Subject: 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 include (typically one level down). svn path=/trunk/KDE/kdelibs/; revision=624040 --- modules/FindQCA2.cmake | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'modules') 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 -- cgit v1.2.1