FindQCA2.cmake doesn't work right (kdenetwork fails)

[Brad Hards]

On Saturday 06 January 2007 07:20, Benjamin Reed wrote:
> On 1/5/07, Alexander Neundorf <neundorf at kde.org> wrote:
> > Is QtCrypto both the name of the directory and the header ?
>
> yup, /opt/kde4-deps/include/QtCrypto contains a header called
> "QtCrypto" that includes "qca.h"
I think I commented about this previously (in "do we trust pkg-config or 
not").

Does this work for you:
Index: FindQCA2.cmake
===================================================================
--- FindQCA2.cmake      (revision 615086)
+++ FindQCA2.cmake      (working copy)
@@ -24,17 +24,18 @@
   INCLUDE(UsePkgConfig)

   IF (NOT WIN32)
-    PKGCONFIG(qca _Qca2IncDir _Qca2LinkDir _Qca2LinkFlags _Qca2Cflags)
+    PKGCONFIG(qca QCA2_INCLUDE_DIR _Qca2LinkDir _Qca2LinkFlags _Qca2Cflags)

     MESSAGE(STATUS "pkg-config returned ${_Qca2IncDir} for QCA 2 includes")
     set(QCA2_DEFINITIONS ${_Qca2Cflags})
+  ELSE (NOT WIN32)
+
+    FIND_PATH(QCA2_INCLUDE_DIR QtCrypto
+      PATHS
+      ${_Qca2IncDir}
+      )
   ENDIF (NOT WIN32)

-  FIND_PATH(QCA2_INCLUDE_DIR QtCrypto
-    PATHS
-    ${_Qca2IncDir}
-    )
-
   MESSAGE(STATUS "QCA2_INCLUDE_DIR has value ${QCA2_INCLUDE_DIR}" )

   FIND_LIBRARY(QCA2_LIBRARIES NAMES qca
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://mail.kde.org/pipermail/kde-buildsystem/attachments/20070106/853775b6/attachment.pgp