On Sunday 16 November 2008 22:35:28 Alexander Neundorf wrote:
> > reavertm sent me a patch [1], with the following comments:
> >
> > <reavertm> this is only 1st problem
> > <reavertm> the second is ... list expansion - QCA2_LIBRARY_DIRS is list -
> > not single entry so it don't work when ytou just add it to find_library
> > as aegument
>
> I think he's wrong here.
> If it looks like "/usr/lib;/usr/local/lib" then it should be perfectly fine
> to add it using a single variable to the find_library() call.
>
> And I think prefixing the variables coming from pkgconfig() with PC_ is
> something we should do, so we don't need code like that:
> set (QCA2_LIBRARIES QCA_LIBRARIES-NOTFOUND)
> and it becomes more obvious where the stuff comes from.
Well, whatever you say, you're the expert :) I'm not very familiar with
pkgconfig and the peculiarities of KDE's buildsystem.
But in any case, this should be fixed rather soon, since some important
packages (okular, kopete) have been failing for several days now. If you need
somebody to test something, I'd be glad to do it -
Based on your suggestion, I've created and attached a patch. With that, okular
builds fine on my system with QCA support.
If it's ok that way, I can commit it to the repo.
Greetings,
~ Sput
--
Manuel "Sputnick" Nickschas ("Sput" on Freenode) | (o<
Member of the Quassel IRC Project - http://quassel-irc.org | //\
Come visit us in #quassel! | V_/_
--- FindQCA2.cmake.orig 2008-11-17 11:33:56.000000000 +0100
+++ FindQCA2.cmake 2008-11-17 11:55:03.000000000 +0100
@@ -26,24 +26,24 @@
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
_______________________________________________
Kde-buildsystem mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-buildsystem
