From ff23bc780fa3f7623bff89a7d85baf7a60749d8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Jacob?= Date: Wed, 24 Jun 2009 23:02:46 +0000 Subject: add documentation svn path=/trunk/KDE/kdelibs/; revision=986742 --- modules/FindEigen2.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/FindEigen2.cmake b/modules/FindEigen2.cmake index 8679a36b..0e86aaf2 100644 --- a/modules/FindEigen2.cmake +++ b/modules/FindEigen2.cmake @@ -1,4 +1,9 @@ # - Try to find Eigen2 lib +# +# This module supports requiring a minimum version, e.g. you can do +# find_package(Eigen2 2.0.3) +# to require version 2.0.3 to newer of Eigen2. +# # Once done this will define # # EIGEN2_FOUND - system has eigen lib with correct version -- cgit v1.2.1 From b27d904b1e3e07e9e61217b6575ef148be8d8f53 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Thu, 25 Jun 2009 07:58:38 +0000 Subject: libsasl2 add, because the windows package of cyrus-sasl2 contains a libsasl2 also for msvc which is not standard conform svn path=/trunk/KDE/kdelibs/; revision=986838 --- modules/FindSasl2.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/FindSasl2.cmake b/modules/FindSasl2.cmake index 855266fc..787b578c 100644 --- a/modules/FindSasl2.cmake +++ b/modules/FindSasl2.cmake @@ -19,7 +19,9 @@ endif (SASL2_INCLUDE_DIR) FIND_PATH(SASL2_INCLUDE_DIR sasl/sasl.h ) -FIND_LIBRARY(SASL2_LIBRARIES NAMES sasl2 +# libsasl2 add for windows, because the windows package of cyrus-sasl2 +# contains a libsasl2 also for msvc which is not standard conform +FIND_LIBRARY(SASL2_LIBRARIES NAMES sasl2 libsasl2 ) include(FindPackageHandleStandardArgs) -- cgit v1.2.1 From 0ad585886909c360d359842c49d109de69cda220 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 28 Jun 2009 08:12:43 +0000 Subject: -fix getting the correct location for the respective configuration, (the resulting name was just "LOCATION_", which is unknown to cmake, so it returns just the information for any configuration it finds Thanks to Aleix for finding the issue Alex svn path=/trunk/KDE/kdelibs/; revision=988522 --- modules/FindKDE4Internal.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index e06789c5..ac9c3542 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -513,9 +513,9 @@ else (_kdeBootStrapping) get_target_property(_importedConfigurations ${KDE4_TARGET_PREFIX}kconfig_compiler IMPORTED_CONFIGURATIONS ) list(GET _importedConfigurations 0 _firstConfig) - get_target_property(KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler LOCATION_${firstConfig}) - get_target_property(KDE4_MEINPROC_EXECUTABLE ${KDE4_TARGET_PREFIX}meinproc4 LOCATION_${firstConfig}) - get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets LOCATION_${firstConfig}) + get_target_property(_KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler LOCATION_${_firstConfig}) + get_target_property(KDE4_MEINPROC_EXECUTABLE ${KDE4_TARGET_PREFIX}meinproc4 LOCATION_${_firstConfig}) + get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets LOCATION_${_firstConfig}) # allow searching cmake modules in all given kde install locations (KDEDIRS based) execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) -- cgit v1.2.1 From 163d24c2ba3b69edbef8ba51d315eec2be0d6714 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Sun, 28 Jun 2009 11:01:03 +0000 Subject: unbreak (remove an underscore too much) svn path=/trunk/KDE/kdelibs/; revision=988553 --- modules/FindKDE4Internal.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index ac9c3542..6ba7c9f6 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -513,7 +513,7 @@ else (_kdeBootStrapping) get_target_property(_importedConfigurations ${KDE4_TARGET_PREFIX}kconfig_compiler IMPORTED_CONFIGURATIONS ) list(GET _importedConfigurations 0 _firstConfig) - get_target_property(_KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler LOCATION_${_firstConfig}) + get_target_property(KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler LOCATION_${_firstConfig}) get_target_property(KDE4_MEINPROC_EXECUTABLE ${KDE4_TARGET_PREFIX}meinproc4 LOCATION_${_firstConfig}) get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets LOCATION_${_firstConfig}) -- cgit v1.2.1