From a0918790682dc06ac7a8dfd80cc3b3926f3d7675 Mon Sep 17 00:00:00 2001 From: Andreas Pakulat Date: Sun, 17 Aug 2008 08:18:03 +0000 Subject: Add documentation for KDE_MIN_VERSION variable svn path=/branches/KDE/4.1/kdelibs/; revision=848170 --- modules/FindKDE4Internal.cmake | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'modules') diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 70ce60ac..a5451d13 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -216,6 +216,13 @@ # without going all over the place, but still produce better performance. # It's also important to note that gcc cannot detect all warning conditions # unless the optimiser is active. +# +# You can set the variable KDE_MIN_VERSION before calling find_package() +# to depend on a particular kdelibs version. For example to depend on +# KDE 4.1.0 you can use +# +# set(KDE_MIN_VERSION "4.1.0") +# find_package(KDE4 REQUIRED) # _KDE4_PLATFORM_INCLUDE_DIRS is used only internally # _KDE4_PLATFORM_DEFINITIONS is used only internally -- cgit v1.2.1 From c1572b73f3af45b8ff8c78389c0e09435a72c270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Jacob?= Date: Mon, 18 Aug 2008 15:04:57 +0000 Subject: backport FindEigen2.cmake. Since some apps like KOffice depend currently on 4.1 libs, i've been told this was useful to backport. svn path=/branches/KDE/4.1/kdelibs/; revision=848852 --- modules/FindEigen2.cmake | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 modules/FindEigen2.cmake (limited to 'modules') diff --git a/modules/FindEigen2.cmake b/modules/FindEigen2.cmake new file mode 100644 index 00000000..924c69a0 --- /dev/null +++ b/modules/FindEigen2.cmake @@ -0,0 +1,30 @@ +# - Try to find Eigen2 lib +# Once done this will define +# +# EIGEN2_FOUND - system has eigen lib +# EIGEN2_INCLUDE_DIR - the eigen include directory + +# Copyright (c) 2006, 2007 Montel Laurent, +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +if (EIGEN2_INCLUDE_DIR) + + # in cache already + set(EIGEN2_FOUND TRUE) + +else (EIGEN2_INCLUDE_DIR) + +find_path(EIGEN2_INCLUDE_DIR NAMES Eigen/Core + PATHS + ${INCLUDE_INSTALL_DIR}/eigen2 + ) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Eigen2 DEFAULT_MSG EIGEN2_INCLUDE_DIR ) + + +mark_as_advanced(EIGEN2_INCLUDE_DIR) + +endif(EIGEN2_INCLUDE_DIR) + -- cgit v1.2.1 From f6a4b3f21f384dc47d781c3b67e6b0e21115dd80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Jacob?= Date: Tue, 19 Aug 2008 13:35:25 +0000 Subject: SVN_SILENT backport minor fix svn path=/branches/KDE/4.1/kdelibs/; revision=849396 --- modules/FindEigen2.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'modules') diff --git a/modules/FindEigen2.cmake b/modules/FindEigen2.cmake index 924c69a0..59eb1dfc 100644 --- a/modules/FindEigen2.cmake +++ b/modules/FindEigen2.cmake @@ -18,6 +18,7 @@ else (EIGEN2_INCLUDE_DIR) find_path(EIGEN2_INCLUDE_DIR NAMES Eigen/Core PATHS ${INCLUDE_INSTALL_DIR}/eigen2 + ${KDE4_INCLUDE_DIR}/eigen2 ) include(FindPackageHandleStandardArgs) -- cgit v1.2.1 From 07fcb50e1a92947ebdd2f998b52cfddc73d9349a Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Fri, 29 Aug 2008 19:12:18 +0000 Subject: Fix Strigi detection to use a version from the 0.5 branch and to not use a newer version. svn path=/branches/KDE/4.1/kdelibs/; revision=854554 --- modules/FindStrigi.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/FindStrigi.cmake b/modules/FindStrigi.cmake index a3725a90..83ac283f 100644 --- a/modules/FindStrigi.cmake +++ b/modules/FindStrigi.cmake @@ -17,6 +17,9 @@ include(FindLibraryWithDebug) if(NOT STRIGI_MIN_VERSION) set(STRIGI_MIN_VERSION "0.5.9") endif(NOT STRIGI_MIN_VERSION) +if(NOT STRIGI_MAX_VERSION) + set(STRIGI_MAX_VERSION "0.5.99") +endif(NOT STRIGI_MAX_VERSION) if (WIN32) file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR) @@ -82,7 +85,7 @@ if (NOT WIN32 AND NOT HAVE_STRIGI_VERSION) # if pkgconfig found strigi, check the version, otherwise print a warning if(_dummyLinkFlags) - exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=${STRIGI_MIN_VERSION} + exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=${STRIGI_MIN_VERSION} --max-version=${STRIGI_MAX_VERSION} libstreamanalyzer RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) if(NOT _return_VALUE STREQUAL "0") -- cgit v1.2.1 From 616b0b0e3e8e0c001aa151a7babe1463f6c0a541 Mon Sep 17 00:00:00 2001 From: David Faure Date: Sat, 13 Sep 2008 00:31:05 +0000 Subject: When strigi is >= 0.6.0, use signed char instead of char. Strong suggestion for the future: KEEPING SOURCE COMPATIBILITY! svn path=/branches/KDE/4.1/kdelibs/; revision=860423 --- modules/FindStrigi.cmake | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'modules') diff --git a/modules/FindStrigi.cmake b/modules/FindStrigi.cmake index 83ac283f..094be9b9 100644 --- a/modules/FindStrigi.cmake +++ b/modules/FindStrigi.cmake @@ -85,6 +85,7 @@ if (NOT WIN32 AND NOT HAVE_STRIGI_VERSION) # if pkgconfig found strigi, check the version, otherwise print a warning if(_dummyLinkFlags) + ## TODO find out why --max-version does not work! exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=${STRIGI_MIN_VERSION} --max-version=${STRIGI_MAX_VERSION} libstreamanalyzer RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) @@ -93,6 +94,11 @@ if (NOT WIN32 AND NOT HAVE_STRIGI_VERSION) message(FATAL_ERROR "Didn't find strigi >= ${STRIGI_MIN_VERSION}") else(NOT _return_VALUE STREQUAL "0") set(HAVE_STRIGI_VERSION TRUE) + set (STRIGI_NEEDS_SIGNED_CHAR FALSE) + exec_program(${PKGCONFIG_EXECUTABLE} ARGS --modversion libstreamanalyzer RETURN_VALUE _version_return_VALUE OUTPUT_VARIABLE _strigiVersion ) + MACRO_ENSURE_VERSION("0.6.0" ${_strigiVersion} STRIGI_NEEDS_SIGNED_CHAR) + # message(STATUS "Strigi version is ${_strigiVersion}. Needs signed char: ${STRIGI_NEEDS_SIGNED_CHAR}") + if(NOT Strigi_FIND_QUIETLY) message(STATUS "Found Strigi >= ${STRIGI_MIN_VERSION}") endif(NOT Strigi_FIND_QUIETLY) -- cgit v1.2.1