From cb5d64618a470700e0ff86435cecc64ca46afcac Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 6 Jan 2009 18:22:56 +0000 Subject: -this should now also work for relative install directories Alex svn path=/trunk/KDE/kdelibs/; revision=906719 --- modules/check_installed_exports_file.cmake | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/modules/check_installed_exports_file.cmake b/modules/check_installed_exports_file.cmake index 454d2a09..ab36b9cf 100644 --- a/modules/check_installed_exports_file.cmake +++ b/modules/check_installed_exports_file.cmake @@ -22,23 +22,25 @@ if(EXISTS "${installedExportsFile}") if (${INSTALL_DIR} MATCHES "^(/)(.+)$") set(binaryDirExportFileDir "_${CMAKE_MATCH_2}") set(binaryDirExportsFile "${CURRENT_BINARY_DIR}/CMakeFiles/Export/${binaryDirExportFileDir}/${FILENAME}") + else (${INSTALL_DIR} MATCHES "^(/)(.+)$") + set(binaryDirExportsFile "${CURRENT_BINARY_DIR}/CMakeFiles/Export/${INSTALL_DIR}/${FILENAME}") + endif (${INSTALL_DIR} MATCHES "^(/)(.+)$") - if(EXISTS "${binaryDirExportsFile}") - file(READ "${installedExportsFile}" installedExportsFileContents) - file(READ "${binaryDirExportsFile}" binaryDirExportsFileContents) + if(EXISTS "${binaryDirExportsFile}") + file(READ "${installedExportsFile}" installedExportsFileContents) + file(READ "${binaryDirExportsFile}" binaryDirExportsFileContents) - if(NOT "${installedExportsFileContents}" STREQUAL "${binaryDirExportsFileContents}") + if(NOT "${installedExportsFileContents}" STREQUAL "${binaryDirExportsFileContents}") - if("${FILENAME}" MATCHES "^(.+)(\\.cmake)$") - message(STATUS "Installed and new ${FILENAME} differ, removing installed ${CMAKE_MATCH_1}-*.cmake files") - file(GLOB files "${installDir}/${CMAKE_MATCH_1}-*.cmake") - file(REMOVE ${files}) - endif("${FILENAME}" MATCHES "^(.+)(\\.cmake)$") -# else(NOT "${installedExportsFileContents}" STREQUAL "${binaryDirExportsFileContents}") -# message(STATUS "FILES are the same") - endif(NOT "${installedExportsFileContents}" STREQUAL "${binaryDirExportsFileContents}") + if("${FILENAME}" MATCHES "^(.+)(\\.cmake)$") + message(STATUS "Installed and new ${FILENAME} differ, removing installed ${CMAKE_MATCH_1}-*.cmake files") + file(GLOB files "${installDir}/${CMAKE_MATCH_1}-*.cmake") + file(REMOVE ${files}) + endif("${FILENAME}" MATCHES "^(.+)(\\.cmake)$") + else(NOT "${installedExportsFileContents}" STREQUAL "${binaryDirExportsFileContents}") + message(STATUS "FILES are the same") + endif(NOT "${installedExportsFileContents}" STREQUAL "${binaryDirExportsFileContents}") - endif(EXISTS "${binaryDirExportsFile}") - endif (${INSTALL_DIR} MATCHES "^(/)(.+)$") + endif(EXISTS "${binaryDirExportsFile}") endif(EXISTS "${installedExportsFile}") -- cgit v1.2.1 From 85b8a06b9be6673fd3c12114e4e073961e6fad7a Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 6 Jan 2009 18:33:02 +0000 Subject: -install the exports file as KDELibs4LibraryTargets.cmake, instead of KDELibsLibraryTargets.cmake -> fix against the problem which happens if you have a relatively old kdelibs installation (when the targets where exported without "namespace"), then switched the buildtype and installed a new kdelibs The patch which makes this safe for the case that we have similar changes in the future will come later today. Alex svn path=/trunk/KDE/kdelibs/; revision=906725 --- 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 cab30f1102a6a326e32616aa5ed483493751bbfb Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Tue, 6 Jan 2009 20:30:27 +0000 Subject: Add FindLibKonq.cmake from kdiff3 to kdelibs so others can use it too svn path=/trunk/KDE/kdelibs/; revision=906765 --- 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 3dfdda2dc0367ccae61938b2a1b835c8612322a8 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 6 Jan 2009 22:04:12 +0000 Subject: -before installing the exports files, compate the new and the already installed one, and if they are different, delete any previously installed configuration specific exports files Alex svn path=/trunk/KDE/kdelibs/; revision=906811 --- modules/check_installed_exports_file.cmake | 119 ++++++++++++++++++----------- 1 file changed, 73 insertions(+), 46 deletions(-) diff --git a/modules/check_installed_exports_file.cmake b/modules/check_installed_exports_file.cmake index ab36b9cf..d1d0c718 100644 --- a/modules/check_installed_exports_file.cmake +++ b/modules/check_installed_exports_file.cmake @@ -1,46 +1,73 @@ -# INSTALL_DIR - set it to the install destination -# INSTALL_PREFIX - set it to CMAKE_INSTALL_PREFIX -# CURRENT_BINARY_DIR - set it to CMAKE_CURRENT_BINARY_DIR -# FILENAME - the filename of the exports file - -# get the absolute install directory, consider absolute and relative paths and also DESTDIR -if(IS_ABSOLUTE "${INSTALL_DIR}") - set(installDir "$ENV{DESTDIR}${INSTALL_DIR}") -else(IS_ABSOLUTE "${INSTALL_DIR}") - set(installDir "$ENV{DESTDIR}${INSTALL_PREFIX}/${INSTALL_DIR}") -endif(IS_ABSOLUTE "${INSTALL_DIR}") - -set(installedExportsFile "${installDir}/${FILENAME}") - - -# if the file already exists at the install location, and if we can -# find the exports file in the build dir, read both, and if their contents differ, -# remove all configuration-specific exports files from the install dir, since -# they may create conflicts if the new targets have been added/targets have been -# removed/ targets have been renamed/ the namespace for the exported targets has changed -if(EXISTS "${installedExportsFile}") - if (${INSTALL_DIR} MATCHES "^(/)(.+)$") - set(binaryDirExportFileDir "_${CMAKE_MATCH_2}") - set(binaryDirExportsFile "${CURRENT_BINARY_DIR}/CMakeFiles/Export/${binaryDirExportFileDir}/${FILENAME}") - else (${INSTALL_DIR} MATCHES "^(/)(.+)$") - set(binaryDirExportsFile "${CURRENT_BINARY_DIR}/CMakeFiles/Export/${INSTALL_DIR}/${FILENAME}") - endif (${INSTALL_DIR} MATCHES "^(/)(.+)$") - - if(EXISTS "${binaryDirExportsFile}") - file(READ "${installedExportsFile}" installedExportsFileContents) - file(READ "${binaryDirExportsFile}" binaryDirExportsFileContents) - - if(NOT "${installedExportsFileContents}" STREQUAL "${binaryDirExportsFileContents}") - - if("${FILENAME}" MATCHES "^(.+)(\\.cmake)$") - message(STATUS "Installed and new ${FILENAME} differ, removing installed ${CMAKE_MATCH_1}-*.cmake files") - file(GLOB files "${installDir}/${CMAKE_MATCH_1}-*.cmake") - file(REMOVE ${files}) - endif("${FILENAME}" MATCHES "^(.+)(\\.cmake)$") - else(NOT "${installedExportsFileContents}" STREQUAL "${binaryDirExportsFileContents}") - message(STATUS "FILES are the same") - endif(NOT "${installedExportsFileContents}" STREQUAL "${binaryDirExportsFileContents}") - - endif(EXISTS "${binaryDirExportsFile}") - -endif(EXISTS "${installedExportsFile}") + +# This file is executed via install(SCRIPT). +# This means it is include()d into the cmake_install.cmake file +# Due to this the following variables already have the correct value: +# CMAKE_INSTALL_PREFIX +# CMAKE_CURRENT_BINARY_DIR +# +# Additionally the following two variables have to be set: +# EXPORT_INSTALL_DIR - set it to the install destination +# EXPORT_FILES - the filenames of the exports file +# +# Alex + + +# put all the code into a function so all variables used here are local +# which makes sure including this file multiple times in a cmake_install.cmake works +function(CHECK_INSTALLED_EXPORTS_FILE _filename) + + # get the absolute install directory, consider absolute and relative paths and also DESTDIR + if(IS_ABSOLUTE "${EXPORT_INSTALL_DIR}") + set(installDir "$ENV{DESTDIR}${EXPORT_INSTALL_DIR}") + else(IS_ABSOLUTE "${EXPORT_INSTALL_DIR}") + set(installDir "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${EXPORT_INSTALL_DIR}") + endif(IS_ABSOLUTE "${EXPORT_INSTALL_DIR}") + + set(installedExportsFile "${installDir}/${_filename}") + + #message(STATUS "************ bin dir: ${CMAKE_CURRENT_BINARY_DIR}") + #message(STATUS "************ prefix: ${CMAKE_INSTALL_PREFIX}") + #message(STATUS "************ exportsfile: ${installedExportsFile}") + + # if the file already exists at the install location, and if we can + # find the exports file in the build dir, read both, and if their contents differ, + # remove all configuration-specific exports files from the install dir, since + # they may create conflicts if the new targets have been added/targets have been + # removed/ targets have been renamed/ the namespace for the exported targets has changed + if(EXISTS "${installedExportsFile}") + if (${EXPORT_INSTALL_DIR} MATCHES "^(/)(.+)$") + set(binaryDirExportFileDir "_${CMAKE_MATCH_2}") + set(binaryDirExportsFile "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/Export/${binaryDirExportFileDir}/${_filename}") + else (${EXPORT_INSTALL_DIR} MATCHES "^(/)(.+)$") + set(binaryDirExportsFile "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/Export/${EXPORT_INSTALL_DIR}/${_filename}") + endif (${EXPORT_INSTALL_DIR} MATCHES "^(/)(.+)$") + + # message(STATUS "************* binaryDirExportsFile: ${binaryDirExportsFile}") + + if(EXISTS "${binaryDirExportsFile}") + file(READ "${installedExportsFile}" installedExportsFileContents) + file(READ "${binaryDirExportsFile}" binaryDirExportsFileContents) + + if(NOT "${installedExportsFileContents}" STREQUAL "${binaryDirExportsFileContents}") + + if("${_filename}" MATCHES "^(.+)(\\.cmake)$") + message(STATUS "XXX Installed and new ${_filename} differ, removing installed ${CMAKE_MATCH_1}-*.cmake files") + file(GLOB exportFiles "${installDir}/${CMAKE_MATCH_1}-*.cmake") +# message(STATUS "XXX files: ${exportFiles}") + file(REMOVE ${exportFiles}) + endif("${_filename}" MATCHES "^(.+)(\\.cmake)$") + else(NOT "${installedExportsFileContents}" STREQUAL "${binaryDirExportsFileContents}") +# message(STATUS "XXX FILES ${_filename} are the same") + endif(NOT "${installedExportsFileContents}" STREQUAL "${binaryDirExportsFileContents}") + + endif(EXISTS "${binaryDirExportsFile}") + + endif(EXISTS "${installedExportsFile}") + +endfunction(CHECK_INSTALLED_EXPORTS_FILE) + +# call the function for each exports file +foreach(_currentExportsFile ${EXPORT_FILES}) + check_installed_exports_file("${_currentExportsFile}") +endforeach(_currentExportsFile ${EXPORT_FILES}) + -- cgit v1.2.1 From 03e430f2ccc3fb31c328026537fb1a851cd9f128 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 9 Jan 2009 07:55:58 +0000 Subject: Need by kdemultimedia too svn path=/trunk/KDE/kdelibs/; revision=908062 --- modules/FindPulseAudio.cmake | 52 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 modules/FindPulseAudio.cmake diff --git a/modules/FindPulseAudio.cmake b/modules/FindPulseAudio.cmake new file mode 100644 index 00000000..3bdec315 --- /dev/null +++ b/modules/FindPulseAudio.cmake @@ -0,0 +1,52 @@ +# Try to find the PulseAudio library +# +# Once done this will define: +# +# PULSEAUDIO_FOUND - system has the PulseAudio library +# PULSEAUDIO_INCLUDE_DIR - the PulseAudio include directory +# PULSEAUDIO_LIBRARY - the libraries needed to use PulseAudio +# +# Copyright (c) 2008, Matthias Kretz, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +if (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY) + # Already in cache, be silent + set(PULSEAUDIO_FIND_QUIETLY TRUE) +endif (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY) + +if (NOT WIN32) + include(FindPkgConfig) + pkg_check_modules(PULSEAUDIO libpulse) + if(PULSEAUDIO_FOUND) + set(PULSEAUDIO_LIBRARY ${PULSEAUDIO_LIBRARIES} CACHE FILEPATH "Path to the PulseAudio library") + set(PULSEAUDIO_INCLUDE_DIR ${PULSEAUDIO_INCLUDEDIR} CACHE PATH "Path to the PulseAudio includes") + # PULSEAUDIO_DEFINITIONS - Compiler switches required for using PulseAudio + # set(PULSEAUDIO_DEFINITIONS ${PULSEAUDIO_CFLAGS}) + endif(PULSEAUDIO_FOUND) +endif (NOT WIN32) + +if (NOT PULSEAUDIO_INCLUDE_DIR) + FIND_PATH(PULSEAUDIO_INCLUDE_DIR pulse/pulseaudio.h) +endif (NOT PULSEAUDIO_INCLUDE_DIR) + +if (NOT PULSEAUDIO_LIBRARY) + FIND_LIBRARY(PULSEAUDIO_LIBRARY NAMES pulse) +endif (NOT PULSEAUDIO_LIBRARY) + +if (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY) + set(PULSEAUDIO_FOUND TRUE) +else (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY) + set(PULSEAUDIO_FOUND FALSE) +endif (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY) + +if (PULSEAUDIO_FOUND) + if (NOT PULSEAUDIO_FIND_QUIETLY) + message(STATUS "Found PulseAudio: ${PULSEAUDIO_LIBRARY}") + endif (NOT PULSEAUDIO_FIND_QUIETLY) +else (PULSEAUDIO_FOUND) + message(STATUS "Could NOT find PulseAudio") +endif (PULSEAUDIO_FOUND) + +#mark_as_advanced(PULSEAUDIO_INCLUDE_DIR PULSEAUDIO_LIBRARY) -- cgit v1.2.1 From 0edc600f2dfef9acf01382a796fd630fa98a6342 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 9 Jan 2009 08:20:13 +0000 Subject: Allow to specify minimum version (need to compile kmix, kmix need pulseaudio >= 0.9.12) svn path=/trunk/KDE/kdelibs/; revision=908067 --- modules/FindPulseAudio.cmake | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/modules/FindPulseAudio.cmake b/modules/FindPulseAudio.cmake index 3bdec315..f9e5855f 100644 --- a/modules/FindPulseAudio.cmake +++ b/modules/FindPulseAudio.cmake @@ -11,6 +11,10 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. +if (NOT PULSEAUDIO_MINIMUM_VERSION) + set(PULSEAUDIO_MINIMUM_VERSION "0.9.9") +endif (NOT PULSEAUDIO_MINIMUM_VERSION) + if (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY) # Already in cache, be silent set(PULSEAUDIO_FIND_QUIETLY TRUE) @@ -18,29 +22,29 @@ endif (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY) if (NOT WIN32) include(FindPkgConfig) - pkg_check_modules(PULSEAUDIO libpulse) + pkg_check_modules(PULSEAUDIO libpulse>=${PULSEAUDIO_MINIMUM_VERSION}) if(PULSEAUDIO_FOUND) set(PULSEAUDIO_LIBRARY ${PULSEAUDIO_LIBRARIES} CACHE FILEPATH "Path to the PulseAudio library") set(PULSEAUDIO_INCLUDE_DIR ${PULSEAUDIO_INCLUDEDIR} CACHE PATH "Path to the PulseAudio includes") # PULSEAUDIO_DEFINITIONS - Compiler switches required for using PulseAudio # set(PULSEAUDIO_DEFINITIONS ${PULSEAUDIO_CFLAGS}) endif(PULSEAUDIO_FOUND) -endif (NOT WIN32) - -if (NOT PULSEAUDIO_INCLUDE_DIR) - FIND_PATH(PULSEAUDIO_INCLUDE_DIR pulse/pulseaudio.h) -endif (NOT PULSEAUDIO_INCLUDE_DIR) +else (NOT WIN32) -if (NOT PULSEAUDIO_LIBRARY) - FIND_LIBRARY(PULSEAUDIO_LIBRARY NAMES pulse) -endif (NOT PULSEAUDIO_LIBRARY) + if (NOT PULSEAUDIO_INCLUDE_DIR) + FIND_PATH(PULSEAUDIO_INCLUDE_DIR pulse/pulseaudio.h) + endif (NOT PULSEAUDIO_INCLUDE_DIR) -if (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY) - set(PULSEAUDIO_FOUND TRUE) -else (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY) - set(PULSEAUDIO_FOUND FALSE) -endif (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY) + if (NOT PULSEAUDIO_LIBRARY) + FIND_LIBRARY(PULSEAUDIO_LIBRARY NAMES pulse) + endif (NOT PULSEAUDIO_LIBRARY) + if (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY) + set(PULSEAUDIO_FOUND TRUE) + else (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY) + set(PULSEAUDIO_FOUND FALSE) + endif (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY) +endif( NOT WIN32) if (PULSEAUDIO_FOUND) if (NOT PULSEAUDIO_FIND_QUIETLY) message(STATUS "Found PulseAudio: ${PULSEAUDIO_LIBRARY}") -- cgit v1.2.1 From 9b1592ac60d8ca3c717085fd2a51789deca298a3 Mon Sep 17 00:00:00 2001 From: Anne-Marie Mahfouf Date: Fri, 9 Jan 2009 15:02:42 +0000 Subject: add a training / so it's easier to call a filename without having to prepend the / OKed by David Faure svn path=/trunk/KDE/kdelibs/; revision=908300 --- modules/KDE4Macros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index f719e4a3..7f5b1d6f 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -826,7 +826,7 @@ macro (KDE4_ADD_EXECUTABLE _target_NAME) _automoc4_kde4_post_target_handling(${_target_NAME}) if (_test) - set_target_properties(${_target_NAME} PROPERTIES COMPILE_FLAGS -DKDESRCDIR="\\"${CMAKE_CURRENT_SOURCE_DIR}\\"") + set_target_properties(${_target_NAME} PROPERTIES COMPILE_FLAGS -DKDESRCDIR="\\"${CMAKE_CURRENT_SOURCE_DIR}/\\"") endif (_test) kde4_handle_rpath_for_executable(${_target_NAME} ${_type}) -- cgit v1.2.1 From a6c9b82dcad7e0847d609bc0673a9c7fe61a34ab Mon Sep 17 00:00:00 2001 From: James Richard Tyrer Date: Sun, 11 Jan 2009 16:00:32 +0000 Subject: updating FindEigen2.cmake for proper search order svn path=/trunk/KDE/kdelibs/; revision=909439 --- modules/FindEigen2.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/FindEigen2.cmake b/modules/FindEigen2.cmake index 2579a6c9..5feddf3e 100644 --- a/modules/FindEigen2.cmake +++ b/modules/FindEigen2.cmake @@ -16,10 +16,10 @@ if (EIGEN2_INCLUDE_DIR) else (EIGEN2_INCLUDE_DIR) find_path(EIGEN2_INCLUDE_DIR NAMES Eigen/Core - PATHS + PATH_SUFFIXES eigen2 + HINTS ${INCLUDE_INSTALL_DIR} ${KDE4_INCLUDE_DIR} - PATH_SUFFIXES eigen2 ) include(FindPackageHandleStandardArgs) -- cgit v1.2.1