From 8b201905bc247e7544d31ab4f4cbbf288f34b416 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 6 Jan 2009 19:07:27 +0000 Subject: -rename the export files to KDELibs4(Library|Tools)Targets.cmake from KDELibs(Library|Tools)Targets.cmake, same patch as in trunk. Fixes the problem with the added namespace for the targets exported from kdelibs a few weeks ago. Patch which will make this safe for the case we have similar changes in the future will first go to trunk, and after RC1 into the branch. Alex svn path=/branches/KDE/4.2/kdelibs/; revision=906738 --- modules/FindKDE4Internal.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 37d1f8c3..0d50b2d5 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -439,7 +439,7 @@ else (_kdeBootStrapping) # the kdeui library could now also be used just as "KDE4__kdeui" and still have all their # dependent libraries handled correctly. But to keep compatibility and not to change # behaviour we set all these variables anyway as seen below. Alex - include(${kde_cmake_module_dir}/KDELibsLibraryTargets.cmake) + include(${kde_cmake_module_dir}/KDELibs4LibraryTargets.cmake) # helper macro, sets both the KDE4_FOO_LIBRARY and KDE4_FOO_LIBS variables to KDE4__foo macro(_KDE4_SET_LIB_VARIABLES _var _lib _prefix) @@ -497,7 +497,7 @@ else (_kdeBootStrapping) # now include the file with the imported tools (executable targets) # Having the libs and tools in two separate files should help with cross compiling. - include(${kde_cmake_module_dir}/KDELibsToolsTargets.cmake) + include(${kde_cmake_module_dir}/KDELibs4ToolsTargets.cmake) # get the build CONFIGURATIONS which were exported in this file, and use just the first # of them to get the location of the installed executables -- cgit v1.2.1 From 550d7c712462caa4eb0b9d4d5b365262dc725020 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Tue, 6 Jan 2009 20:49:35 +0000 Subject: Backport r906765 cmake/trunk/KDE/kdelibs/cmake/modules/FindLibKonq.cmake Add FindLibKonq.cmake from kdiff3 to kdelibs so others can use it too svn path=/branches/KDE/4.2/kdelibs/; revision=906771 --- modules/FindLibKonq.cmake | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 modules/FindLibKonq.cmake diff --git a/modules/FindLibKonq.cmake b/modules/FindLibKonq.cmake new file mode 100644 index 00000000..f9a06d2f --- /dev/null +++ b/modules/FindLibKonq.cmake @@ -0,0 +1,39 @@ +# - Try to find konqueror library +# Once done this will define +# +# LIBKONQ_FOUND - system has libkonq library +# LIBKONQ_INCLUDE_DIR - the LIBKONQ include directory +# LIBKONQ_LIBRARY - the libkonq library +# +# Original file: FindMarbleWidget.cmake (found in digikam-0.10.0-beta2) +# copyright 2008 by Patrick Spendrin +# use this file as you like +# +# Modifications to find libkonq by Joachim Eibl 2008 + +if(LIBKONQ_INCLUDE_DIR AND LIBKONQ_LIBRARY) + + # Already in cache + set(LIBKONQ_FOUND TRUE) + +else(LIBKONQ_INCLUDE_DIR AND LIBKONQ_LIBRARY) + find_path(LIBKONQ_INCLUDE_DIR konq_popupmenuplugin.h ) + + find_library(LIBKONQ_LIBRARY konq) + + if(LIBKONQ_INCLUDE_DIR AND LIBKONQ_LIBRARY) + set(LIBKONQ_FOUND TRUE) + endif(LIBKONQ_INCLUDE_DIR AND LIBKONQ_LIBRARY) + + if(LIBKONQ_FOUND) + if (NOT LIBKONQ_FIND_QUIETLY) + message(STATUS "Found libkonq: ${LIBKONQ_LIBRARY}") + endif (NOT LIBKONQ_FIND_QUIETLY) + else(LIBKONQ_FOUND) + if(LIBKONQ_FIND_REQUIRED) + message(FATAL_ERROR "Could NOT find KDE4 libkonq library") + endif(LIBKONQ_FIND_REQUIRED) + endif(LIBKONQ_FOUND) + + mark_as_advanced(LIBKONQ_INCLUDE_DIR LIBKONQ_LIBRARY) +endif(LIBKONQ_INCLUDE_DIR AND LIBKONQ_LIBRARY) -- cgit v1.2.1 From c6478ba5c0c6379638e3f3303f290e78cf074fd1 Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Mon, 12 Jan 2009 19:52:30 +0000 Subject: Increase the minimum Strigi version to 0.6.3. svn path=/branches/KDE/4.2/kdelibs/; revision=910168 --- modules/FindStrigi.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FindStrigi.cmake b/modules/FindStrigi.cmake index f0a3921e..0594a5eb 100644 --- a/modules/FindStrigi.cmake +++ b/modules/FindStrigi.cmake @@ -15,7 +15,7 @@ if(NOT STRIGI_MIN_VERSION) - set(STRIGI_MIN_VERSION "0.5.9") + set(STRIGI_MIN_VERSION "0.6.3") endif(NOT STRIGI_MIN_VERSION) file(TO_CMAKE_PATH "$ENV{STRIGI_HOME}" strigi_home) -- cgit v1.2.1 From 0ed48c91f177d32f20efcd2347752b0a1b448ba0 Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Tue, 13 Jan 2009 07:16:03 +0000 Subject: Revert the required version number here and put it in kdelibs/CMakeLists.txt. This is a request by Alexander Neundorf for improving the generality of FindStrigi.cmake. Individual project should set the required version themselves by using: set(STRIGI_MIN_VERSION 0.6.3) use_package(Strigi REQUIRED) CCMAIL:neundorf@kde.org svn path=/branches/KDE/4.2/kdelibs/; revision=910348 --- modules/FindStrigi.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FindStrigi.cmake b/modules/FindStrigi.cmake index 0594a5eb..f0a3921e 100644 --- a/modules/FindStrigi.cmake +++ b/modules/FindStrigi.cmake @@ -15,7 +15,7 @@ if(NOT STRIGI_MIN_VERSION) - set(STRIGI_MIN_VERSION "0.6.3") + set(STRIGI_MIN_VERSION "0.5.9") endif(NOT STRIGI_MIN_VERSION) file(TO_CMAKE_PATH "$ENV{STRIGI_HOME}" strigi_home) -- cgit v1.2.1 From fb5942b5076c3af75c54d3775e6a9919cde4f638 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Sun, 25 Jan 2009 17:52:10 +0000 Subject: it's libgmp on windows svn path=/branches/KDE/4.2/kdelibs/; revision=916641 --- modules/FindGMP.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FindGMP.cmake b/modules/FindGMP.cmake index 67ccbbb1..17d175c6 100644 --- a/modules/FindGMP.cmake +++ b/modules/FindGMP.cmake @@ -15,7 +15,7 @@ if (GMP_INCLUDE_DIR AND GMP_LIBRARIES) endif (GMP_INCLUDE_DIR AND GMP_LIBRARIES) find_path(GMP_INCLUDE_DIR NAMES gmp.h ) -find_library(GMP_LIBRARIES NAMES gmp ) +find_library(GMP_LIBRARIES NAMES gmp libgmp) include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMP DEFAULT_MSG GMP_INCLUDE_DIR GMP_LIBRARIES) -- cgit v1.2.1 From f23f060bb94cc76f8493322e8f220c2f5cc5bde7 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 9 Feb 2009 22:42:26 +0000 Subject: explicitely set CMP0011 to OLD, so we don't get the warning printed out with cmake >= 2.6.3 (but the behaviour is not changed by this) Alex svn path=/branches/KDE/4.2/kdelibs/; revision=924047 --- modules/FindKDE4Internal.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 0d50b2d5..94297f9d 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -260,6 +260,13 @@ cmake_policy(SET CMP0002 OLD) cmake_policy(SET CMP0003 OLD) # CMP0005: keep escaping behaviour for definitions added via add_definitions() cmake_policy(SET CMP0005 OLD) +# since cmake 2.6.3: NEW behaviour is that setting policies doesn't "escape" the file +# where this is done, macros and functions are executed with the policies as they +# were when the were defined. Keep the OLD behaviour so we can set the policies here +# for all KDE software without the big warning +if(POLICY CMP0011) + cmake_policy(SET CMP0011 OLD) +endif(POLICY CMP0011) # Only do something if it hasn't been found yet -- cgit v1.2.1 From 469212995470a758c17bec178031ce04dcdc2fa4 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 27 Feb 2009 16:49:10 +0000 Subject: backport poppler detection fix svn path=/branches/KDE/4.2/kdelibs/; revision=932964 --- modules/FindPopplerQt4.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FindPopplerQt4.cmake b/modules/FindPopplerQt4.cmake index b4ee4086..fbc1820c 100644 --- a/modules/FindPopplerQt4.cmake +++ b/modules/FindPopplerQt4.cmake @@ -26,7 +26,7 @@ endif(NOT WIN32) find_path(POPPLER_QT4_INCLUDE_DIR NAMES poppler-qt4.h - PATH_SUFFIXES poppler + PATH_SUFFIXES poppler/qt4 poppler PATHS ${_PopplerQt4IncDir} ) -- cgit v1.2.1 From 326d48e2cd2d9985e46da666389dfcffe5da8c77 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Wed, 25 Mar 2009 04:20:29 +0000 Subject: don't want to do app-bundle stuff on OSX if we're using Qt/X11 svn path=/branches/KDE/4.2/kdelibs/; revision=944114 --- modules/KDE4Macros.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index f719e4a3..5533284b 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -1059,7 +1059,7 @@ macro (KDE4_ADD_APP_ICON appsources pattern) message(STATUS "Unable to find the png2ico or windres utilities - application will not have an application icon!") endif(PNG2ICO_EXECUTABLE AND WINDRES_EXECUTABLE) endif(WIN32) - if (APPLE) + if (Q_WS_MAC) # first convert image to a tiff using the Mac OS X "sips" utility, # then use tiff2icns to convert to an icon find_program(SIPS_EXECUTABLE NAMES sips) @@ -1104,7 +1104,7 @@ macro (KDE4_ADD_APP_ICON appsources pattern) else(SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE) message(STATUS "Unable to find the sips and tiff2icns utilities - application will not have an application icon!") endif(SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE) - endif(APPLE) + endif(Q_WS_MAC) endmacro (KDE4_ADD_APP_ICON) -- cgit v1.2.1