[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-buildsystem
Subject:    Re: KDE/kdepimlibs/cmake/modules
From:       Hasso Tepper <hasso () kde ! org>
Date:       2009-01-30 19:05:59
Message-ID: 200901302105.59582.hasso () kde ! org
[Download RAW message or body]

Andreas Pakulat wrote:
> No idea, I think thats a question for the cmake list and you might want
> to check wether there are any patches that you're applying to cmake
> which might break this. Really sounds like your cmake is somehow
> broken...

There is no patches and most of stuff is found fine. I'm talking about 
cmake files like kdebase/runtime/cmake/modules/FindCLucene.cmake for 
example. There have been more such files in the past :).

In concrete case (ie FindLibical.cmake) it's the problem IMHO that 
pkg-config isn't used. So, here is the minimal patch to make it work.
Again, if there is no objections, I will commit it in Sunday. 


regards,

-- 
Hasso Tepper

["FindLibical.cmake.patch" (text/x-diff)]

Index: FindLibical.cmake
===================================================================
--- FindLibical.cmake	(revision 918679)
+++ FindLibical.cmake	(working copy)
@@ -33,15 +33,20 @@
   file(TO_CMAKE_PATH "${LIBICAL_BASE}" libical_root )
 endif(DEFINED LIBICAL_BASE)
 
+if (NOT WIN32)
+  find_package(PkgConfig)
+  pkg_check_modules(PC_LIBICAL libical>=${LIBICAL_MIN_VERSION})
+endif (NOT WIN32)
+
 find_path(LIBICAL_INCLUDE_DIRS NAMES libical/ical.h
-  HINTS ${libical_root}/include ${_program_FILES_DIR}/libical/include \
${KDE4_INCLUDE_DIR} +  HINTS ${libical_root}/include \
${_program_FILES_DIR}/libical/include ${PC_LIBICAL_INCLUDEDIR} \
${PC_LIBICAL_INCLUDE_DIRS} ${KDE4_INCLUDE_DIR}  )
 
 find_library(LIBICAL_LIBRARY NAMES ical libical
-  HINTS ${libical_root}/lib ${_program_FILES_DIR}/libical/lib \
${KDE4_LIB_DIR} +  HINTS ${libical_root}/lib \
${_program_FILES_DIR}/libical/lib ${PC_LIBICAL_LIBDIR} \
${PC_LIBICAL_LIBRARY_DIRS} ${KDE4_LIB_DIR}  )
 find_library(LIBICALSS_LIBRARY NAMES icalss libicalss
-  HINTS ${libical_root}/lib ${_program_FILES_DIR}/libical/lib \
${KDE4_LIB_DIR} +  HINTS ${libical_root}/lib \
${_program_FILES_DIR}/libical/lib ${PC_LIBICAL_LIBDIR} \
${PC_LIBICAL_LIBRARY_DIRS} ${KDE4_LIB_DIR}  )
 set(LIBICAL_LIBRARIES ${LIBICAL_LIBRARY} ${LIBICALSS_LIBRARY})
 



_______________________________________________
Kde-buildsystem mailing list
Kde-buildsystem@kde.org
https://mail.kde.org/mailman/listinfo/kde-buildsystem


[prev in list] [next in list] [prev in thread] [next in thread]