From c209127615b2168fb86e44de160db4b492833b25 Mon Sep 17 00:00:00 2001 From: Marijn Kruisselbrink Date: Thu, 10 Jan 2008 23:03:01 +0000 Subject: make kde4_add_unit_test work properly on OSX together with non-NOGUI tests. I'm not entirely convinced this is the best way to fix it, but it seems to work fine (and it is at least better than the current situation). svn path=/trunk/KDE/kdelibs/; revision=759619 --- modules/KDE4Macros.cmake | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index cbb7def8..ffeb07c4 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -749,6 +749,13 @@ macro (KDE4_ADD_UNIT_TEST _test_NAME) set(_targetName ${ARGV2}) list(REMOVE_AT _srcList 0 1) endif( ${ARGV1} STREQUAL "TESTNAME" ) + + set(_nogui) + list(GET ${_srcList} 0 first_PARAM) + if( ${first_PARAM} STREQUAL "NOGUI" ) + set(_nogui "NOGUI") + endif( ${first_PARAM} STREQUAL "NOGUI" ) + kde4_add_executable( ${_test_NAME} TEST ${_srcList} ) if(NOT KDE4_TEST_OUTPUT) @@ -766,12 +773,17 @@ macro (KDE4_ADD_UNIT_TEST _test_NAME) endif(NOT using_qtest) endforeach(_filename) + set(_executable ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME}) + if (Q_WS_MAC AND NOT _nogui) + set(_executable ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME}.app/Contents/MacOS/${_test_NAME}) + endif (Q_WS_MAC AND NOT _nogui) + if (using_qtest AND KDE4_TEST_OUTPUT STREQUAL "xml") #MESSAGE(STATUS "${_targetName} : Using QTestLib, can produce XML report.") - add_test( ${_targetName} ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME} -xml -o ${_targetName}.tml) + add_test( ${_targetName} ${_executable} -xml -o ${_targetName}.tml) else (using_qtest AND KDE4_TEST_OUTPUT STREQUAL "xml") #MESSAGE(STATUS "${_targetName} : NOT using QTestLib, can't produce XML report, please use QTestLib to write your unit tests.") - add_test( ${_targetName} ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME} ) + add_test( ${_targetName} ${_executable} ) endif (using_qtest AND KDE4_TEST_OUTPUT STREQUAL "xml") # add_test( ${_targetName} ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME} -xml -o ${_test_NAME}.tml ) -- cgit v1.2.1 From 96fa4f5b130490766a58e80d0bfb38813c79efba Mon Sep 17 00:00:00 2001 From: Josef Spillner Date: Fri, 11 Jan 2008 18:43:57 +0000 Subject: - libstreams is not enough, streamanalyzer is also needed (those two are separate packages sometimes) svn path=/trunk/KDE/kdelibs/; revision=760011 --- modules/FindStrigi.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FindStrigi.cmake b/modules/FindStrigi.cmake index b34596e1..5368b318 100644 --- a/modules/FindStrigi.cmake +++ b/modules/FindStrigi.cmake @@ -115,7 +115,7 @@ endif (NOT WIN32 AND NOT HAVE_STRIGI_VERSION) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Strigi - "Couldn't find Strigi streams library. Set the environment variable STRIGI_HOME (or CMAKE_FIND_PREFIX_PATH if using CMake >=2.5) to the strigi install dir." + "Couldn't find Strigi streams and streamanalyzer libraries. Set the environment variable STRIGI_HOME (or CMAKE_FIND_PREFIX_PATH if using CMake >=2.5) to the strigi install dir." STRIGI_STREAMS_LIBRARY STRIGI_STREAMANALYZER_LIBRARY STRIGI_INCLUDE_DIR) mark_as_advanced(STRIGI_INCLUDE_DIR STRIGI_STREAMANALYZER_LIBRARY STRIGI_STREAMS_LIBRARY STRIGI_STRIGIQTDBUSCLIENT_LIBRARY ) -- cgit v1.2.1 From d5e405ffeae838614d49dd94f30cc13451065eb1 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Sat, 12 Jan 2008 16:34:14 +0000 Subject: - if all packages were found, provide a message saying so - cleanup the output a little. - not all found packages are optional; some are required. so reduce confusion by saying "external" instead. svn path=/trunk/KDE/kdelibs/; revision=760423 --- modules/MacroLogFeature.cmake | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/modules/MacroLogFeature.cmake b/modules/MacroLogFeature.cmake index cac4ef87..f0f39882 100644 --- a/modules/MacroLogFeature.cmake +++ b/modules/MacroLogFeature.cmake @@ -88,27 +88,38 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG) SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt) IF (EXISTS ${_file}) FILE(READ ${_file} _requirements) - MESSAGE(STATUS "\n-------------------------------------------------------------------------------\n-- The following REQUIRED packages could NOT be located on your system. --\n-- Please install them before continuing with this software installation. --\n-------------------------------------------------------------------------------\n${_requirements}-------------------------------------------------------------------------------") + MESSAGE(STATUS "\n-----------------------------------------------------------------------------\n-- The following REQUIRED packages could NOT be located on your system.\n-- Please install them before continuing this software installation.\n-----------------------------------------------------------------------------\n${_requirements}-----------------------------------------------------------------------------") FILE(REMOVE ${_file}) MESSAGE(FATAL_ERROR "Exiting: Missing Requirements") ENDIF (EXISTS ${_file}) SET(_summary "\n") + SET(_elist 0) SET(_file ${CMAKE_BINARY_DIR}/EnabledFeatures.txt) IF (EXISTS ${_file}) + SET(_elist 1) FILE(READ ${_file} _enabled) FILE(REMOVE ${_file}) - SET(_summary "${_summary}-------------------------------------------------------------------------------\n-- The following OPTIONAL packages were located on your system. --\n-- This software installation will have features provided by these packages. --\n-------------------------------------------------------------------------------\n${_enabled}") + SET(_summary "${_summary}-----------------------------------------------------------------------------\n-- The following external packages were located on your system.\n-- This installation will have the extra features provided by these packages.\n${_enabled}") ENDIF (EXISTS ${_file}) + SET(_dlist 0) SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt) IF (EXISTS ${_file}) + SET(_dlist 1) FILE(READ ${_file} _disabled) FILE(REMOVE ${_file}) - SET(_summary "${_summary}-------------------------------------------------------------------------------\n-- The following OPTIONAL packages could NOT be located on your system. --\n-- Consider installing them to enable more features from this software. --\n-------------------------------------------------------------------------------\n${_disabled}") + SET(_summary "${_summary}-----------------------------------------------------------------------------\n-- The following OPTIONAL packages could NOT be located on your system.\n-- Consider installing them to enable more features from this software.\n${_disabled}") + ELSE (EXISTS ${_file}) + IF (${_elist}) + SET(_summary "${_summary}Congratulations! All external packages have been found.\n") + ENDIF (${_elist}) ENDIF (EXISTS ${_file}) + IF (${_elist} OR ${_dlist}) + SET(_summary "${_summary}-----------------------------------------------------------------------------\n") + ENDIF (${_elist} OR ${_dlist}) MESSAGE(STATUS "${_summary}") ENDMACRO(MACRO_DISPLAY_FEATURE_LOG) -- cgit v1.2.1 From c05f234f7cdb76dd4296b945be326d1916edac77 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Sat, 12 Jan 2008 16:37:34 +0000 Subject: add -Wall to the Intel C/C++ compiler options I wonder if we should also add -Wcheck? svn path=/trunk/KDE/kdelibs/; revision=760425 --- modules/FindKDE4Internal.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index c7701e7c..c7e6fcfe 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -940,8 +940,8 @@ if (CMAKE_C_COMPILER MATCHES "icc") set(CMAKE_C_FLAGS_DEBUG "-O2 -g -Ob0 -noalign") set(CMAKE_C_FLAGS_DEBUGFULL "-g -Ob0 -noalign") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ansi -Wpointer-arith -fno-common") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi -Wpointer-arith -fno-exceptions -fno-common") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ansi -Wall -Wpointer-arith -fno-common") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi -Wall -Wpointer-arith -fno-exceptions -fno-common") # visibility support set(__KDE_HAVE_ICC_VISIBILITY) -- cgit v1.2.1 From 7620d7a3c3e7d20bbf44ad20d94276acab735fdf Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Sat, 12 Jan 2008 22:40:11 +0000 Subject: turn off Intel C/C++ compiler remarks. they are a nuisance. svn path=/trunk/KDE/kdelibs/; revision=760550 --- modules/FindKDE4Internal.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index c7e6fcfe..2ac6f6d9 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -940,8 +940,8 @@ if (CMAKE_C_COMPILER MATCHES "icc") set(CMAKE_C_FLAGS_DEBUG "-O2 -g -Ob0 -noalign") set(CMAKE_C_FLAGS_DEBUGFULL "-g -Ob0 -noalign") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ansi -Wall -Wpointer-arith -fno-common") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi -Wall -Wpointer-arith -fno-exceptions -fno-common") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ansi -Wall -w1 -Wpointer-arith -fno-common") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi -Wall -w1 -Wpointer-arith -fno-exceptions -fno-common") # visibility support set(__KDE_HAVE_ICC_VISIBILITY) -- cgit v1.2.1 From e0a0a1fb43d31de72eeba546366bfc4a32e63f21 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Sun, 13 Jan 2008 17:21:05 +0000 Subject: set USE_FULL_RPATH to OFF for APPLE since anything else leaves us with bad install_names svn path=/trunk/KDE/kdelibs/; revision=760906 --- modules/FindKDE4Internal.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 2ac6f6d9..806488e2 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -710,7 +710,13 @@ endif (WIN32) # setup default RPATH/install_name handling, may be overridden by KDE4_HANDLE_RPATH_FOR_[LIBRARY|EXECUTABLE] # default is to build with RPATH for the install dir, so it doesn't need to relink if (UNIX) - option(KDE4_USE_ALWAYS_FULL_RPATH "If set to TRUE, also libs and plugins will be linked with the full RPATH, which will usually make them work better, but make install will take longer." ON) + if (NOT APPLE) + set( _KDE4_DEFAULT_USE_FULL_RPATH ON ) + else (NOT APPLE) + set( _KDE4_DEFAULT_USE_FULL_RPATH OFF ) + endif (NOT APPLE) + + option(KDE4_USE_ALWAYS_FULL_RPATH "If set to TRUE, also libs and plugins will be linked with the full RPATH, which will usually make them work better, but make install will take longer." _KDE4_DEFAULT_USE_FULL_RPATH) set( _KDE4_PLATFORM_INCLUDE_DIRS) -- cgit v1.2.1 From e26b90a4c8f97d64d17df2d32ba2e296871d1ae6 Mon Sep 17 00:00:00 2001 From: Bernhard Rosenkraenzer Date: Mon, 14 Jan 2008 12:37:53 +0000 Subject: Locate PCRE headers if they're in /SOMEINCLUDEDIR/pcre svn path=/trunk/KDE/kdelibs/; revision=761293 --- modules/FindPCRE.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FindPCRE.cmake b/modules/FindPCRE.cmake index f0cc940d..e18b109d 100644 --- a/modules/FindPCRE.cmake +++ b/modules/FindPCRE.cmake @@ -16,7 +16,7 @@ if (PCRE_INCLUDE_DIR AND PCRE_LIBRARIES AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE set(PCRE_FIND_QUIETLY TRUE) endif (PCRE_INCLUDE_DIR AND PCRE_LIBRARIES AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY) -FIND_PATH(PCRE_INCLUDE_DIR pcre.h ) +FIND_PATH(PCRE_INCLUDE_DIR pcre.h PATH_SUFFIXES pcre) FIND_LIBRARY(PCRE_PCRE_LIBRARY NAMES pcre) -- cgit v1.2.1 From 4fed5e58aa64ea5c1e9ef9d582fc5fb06ba7be78 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Mon, 14 Jan 2008 18:34:08 +0000 Subject: change find include dir message to be less specific about the KDE 4 minor version. svn path=/trunk/KDE/kdelibs/; revision=761382 --- modules/FindKDE4Internal.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 806488e2..e2dfa71f 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -983,7 +983,7 @@ macro (KDE4_PRINT_RESULTS) # inside kdelibs the include dir and lib dir are internal, not "found" if (NOT _kdeBootStrapping) if(KDE4_INCLUDE_DIR) - message(STATUS "Found KDE 4.0 include dir: ${KDE4_INCLUDE_DIR}") + message(STATUS "Found KDE 4 include dir: ${KDE4_INCLUDE_DIR}") else(KDE4_INCLUDE_DIR) message(STATUS "ERROR: unable to find KDE 4 headers") endif(KDE4_INCLUDE_DIR) -- cgit v1.2.1 From 76e484e69e95cdd0550304a714c0e2ff83cb2858 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 15 Jan 2008 00:09:03 +0000 Subject: fix it Alex svn path=/trunk/KDE/kdelibs/; revision=761504 --- modules/FindKDE4Internal.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index e2dfa71f..e9f9ac43 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -716,7 +716,7 @@ if (UNIX) set( _KDE4_DEFAULT_USE_FULL_RPATH OFF ) endif (NOT APPLE) - option(KDE4_USE_ALWAYS_FULL_RPATH "If set to TRUE, also libs and plugins will be linked with the full RPATH, which will usually make them work better, but make install will take longer." _KDE4_DEFAULT_USE_FULL_RPATH) + option(KDE4_USE_ALWAYS_FULL_RPATH "If set to TRUE, also libs and plugins will be linked with the full RPATH, which will usually make them work better, but make install will take longer." ${_KDE4_DEFAULT_USE_FULL_RPATH} ) set( _KDE4_PLATFORM_INCLUDE_DIRS) -- cgit v1.2.1 From caaa202461158f4ec396da790628a01a2d7d1c56 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Tue, 15 Jan 2008 14:25:29 +0000 Subject: say "4.1" when finding the internal include or lib. mueller@kde.org svn path=/trunk/KDE/kdelibs/; revision=761874 --- modules/FindKDE4Internal.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index e9f9ac43..7b71836b 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -983,13 +983,13 @@ macro (KDE4_PRINT_RESULTS) # inside kdelibs the include dir and lib dir are internal, not "found" if (NOT _kdeBootStrapping) if(KDE4_INCLUDE_DIR) - message(STATUS "Found KDE 4 include dir: ${KDE4_INCLUDE_DIR}") + message(STATUS "Found KDE 4.1 include dir: ${KDE4_INCLUDE_DIR}") else(KDE4_INCLUDE_DIR) message(STATUS "ERROR: unable to find KDE 4 headers") endif(KDE4_INCLUDE_DIR) if(KDE4_LIB_DIR) - message(STATUS "Found KDE 4 library dir: ${KDE4_LIB_DIR}") + message(STATUS "Found KDE 4.1 library dir: ${KDE4_LIB_DIR}") else(KDE4_LIB_DIR) message(STATUS "ERROR: unable to find KDE 4 core library") endif(KDE4_LIB_DIR) -- cgit v1.2.1 From c6c19b29b690360509746406f9abaa1566f9096b Mon Sep 17 00:00:00 2001 From: Sebastian Trueg Date: Wed, 16 Jan 2008 13:50:37 +0000 Subject: Min Soprano version is now 2.0 svn path=/trunk/KDE/kdelibs/; revision=762185 --- modules/FindSoprano.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/FindSoprano.cmake b/modules/FindSoprano.cmake index 93e01a01..ffa464df 100644 --- a/modules/FindSoprano.cmake +++ b/modules/FindSoprano.cmake @@ -79,10 +79,10 @@ STRING(REGEX MATCH "SOPRANO_VERSION_STRING \".*\"\n" SOPRANO_VERSION_MATCH ${SOPRANO_VERSION_CONTENT}) IF (SOPRANO_VERSION_MATCH) STRING(REGEX REPLACE "SOPRANO_VERSION_STRING \"(.*)\"\n" "\\1" SOPRANO_VERSION ${SOPRANO_VERSION_MATCH}) - if(SOPRANO_VERSION STRLESS "1.99") + if(SOPRANO_VERSION STRLESS "2.0") set(Soprano_FOUND FALSE) - message(FATAL_ERROR "Soprano version ${SOPRANO_VERSION} is too old. Please install 1.99 or newer") - endif(SOPRANO_VERSION STRLESS "1.99") + message(FATAL_ERROR "Soprano version ${SOPRANO_VERSION} is too old. Please install 2.0 or newer") + endif(SOPRANO_VERSION STRLESS "2.0") ENDIF (SOPRANO_VERSION_MATCH) endif(Soprano_FOUND) -- cgit v1.2.1 From 39c3e2344c4178f258f2a96133bd587938a7f686 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Thu, 17 Jan 2008 16:16:55 +0000 Subject: Strinctly require shared-mime-info 0.20 or later. svn path=/trunk/KDE/kdelibs/; revision=762655 --- modules/FindSharedMimeInfo.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/FindSharedMimeInfo.cmake b/modules/FindSharedMimeInfo.cmake index 154e58a5..b00c0320 100644 --- a/modules/FindSharedMimeInfo.cmake +++ b/modules/FindSharedMimeInfo.cmake @@ -10,7 +10,7 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. # the minimum version of shared-mime-database we require -set(SHARED_MIME_INFO_MINIMUM_VERSION "0.18") +set(SHARED_MIME_INFO_MINIMUM_VERSION "0.20") if (UPDATE_MIME_DATABASE_EXECUTABLE) @@ -37,7 +37,7 @@ else (UPDATE_MIME_DATABASE_EXECUTABLE) message(STATUS "Found shared-mime-info version: ${smiVersion}") macro_ensure_version(${SHARED_MIME_INFO_MINIMUM_VERSION} ${smiVersion} _smiVersion_OK) if (NOT _smiVersion_OK) - message(STATUS "WARNING: the found version of shared-mime-info (${smiVersion}) is below the minimum required (${SHARED_MIME_INFO_MINIMUM_VERSION})") + message(FATAL_ERROR "The found version of shared-mime-info (${smiVersion}) is below the minimum required (${SHARED_MIME_INFO_MINIMUM_VERSION})") endif (NOT _smiVersion_OK) endif (NOT SharedMimeInfo_FIND_QUIETLY) -- cgit v1.2.1 From 15e41e39f4ff6ed259848d960a28cb1f277047b2 Mon Sep 17 00:00:00 2001 From: Sebastian Trueg Date: Sat, 19 Jan 2008 08:43:16 +0000 Subject: * Make the Soprano minimum version configurable with a default of 1.99 for backwards compatibility. svn path=/trunk/KDE/kdelibs/; revision=763296 --- modules/FindSoprano.cmake | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/modules/FindSoprano.cmake b/modules/FindSoprano.cmake index ffa464df..2f726db9 100644 --- a/modules/FindSoprano.cmake +++ b/modules/FindSoprano.cmake @@ -1,4 +1,18 @@ - +# +# Find an installation of Soprano +# +# Sets the following variables: +# Soprano_FOUND - true is Soprano has been found +# SOPRANO_INCLUDE_DIR - The include directory +# SOPRANO_LIBRARIES - The Soprano core library to link to (libsoprano) +# SOPRANO_INDEX_LIBRARIES - The Soprano index library (libsopranoindex) +# SOPRANO_CLIENT_LIBRARIES - The Soprano client library (libsopranoclient) +# SOPRANO_SERVER_LIBRARIES - The Soprano server library (libsopranoserver) +# SOPRANO_VERSION - The Soprano version (string value) +# +# Options: +# Set SOPRANO_MIN_VERSION to set the minimum required Soprano version (default: 1.99) +# #if(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES AND SOPRANO_INDEX_LIBRARIES AND SOPRANO_SERVER_LIBRARIES) @@ -55,7 +69,6 @@ ) # check for all the libs as required to make sure that we do not try to compile with an old version - # FIXME: introduce a Soprano version check if(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES) set(Soprano_FOUND TRUE) @@ -74,15 +87,21 @@ endif(Soprano_FOUND AND SOPRANO_SERVER_LIBRARIES) # check Soprano version + + # We set a default for the minimum required version to be backwards compatible + IF(NOT SOPRANO_MIN_VERSION) + SET(SOPRANO_MIN_VERSION "1.99") + ENDIF(NOT SOPRANO_MIN_VERSION) + if(Soprano_FOUND) FILE(READ ${SOPRANO_INCLUDE_DIR}/soprano/version.h SOPRANO_VERSION_CONTENT) STRING(REGEX MATCH "SOPRANO_VERSION_STRING \".*\"\n" SOPRANO_VERSION_MATCH ${SOPRANO_VERSION_CONTENT}) IF (SOPRANO_VERSION_MATCH) STRING(REGEX REPLACE "SOPRANO_VERSION_STRING \"(.*)\"\n" "\\1" SOPRANO_VERSION ${SOPRANO_VERSION_MATCH}) - if(SOPRANO_VERSION STRLESS "2.0") + if(SOPRANO_VERSION STRLESS "${SOPRANO_MIN_VERSION}") set(Soprano_FOUND FALSE) - message(FATAL_ERROR "Soprano version ${SOPRANO_VERSION} is too old. Please install 2.0 or newer") - endif(SOPRANO_VERSION STRLESS "2.0") + message(FATAL_ERROR "Soprano version ${SOPRANO_VERSION} is too old. Please install ${SOPRANO_MIN_VERSION} or newer") + endif(SOPRANO_VERSION STRLESS "${SOPRANO_MIN_VERSION}") ENDIF (SOPRANO_VERSION_MATCH) endif(Soprano_FOUND) -- cgit v1.2.1 From 1f55f97829c1539498fd8528fe6dc8ec19f1c012 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 20 Jan 2008 22:29:14 +0000 Subject: -default minimum version 0.18 (as shipped with KDE 4.0.0), but now user overridable, used in mimetypes/CMakeLists.txt (see discussion on k-c-d, http://lists.kde.org/?t=119953210500006 ) Alex CCMAIL: toscano.pino@tiscali.it are there more places where this is used ? svn path=/trunk/KDE/kdelibs/; revision=764073 --- modules/FindSharedMimeInfo.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/FindSharedMimeInfo.cmake b/modules/FindSharedMimeInfo.cmake index b00c0320..e3966b86 100644 --- a/modules/FindSharedMimeInfo.cmake +++ b/modules/FindSharedMimeInfo.cmake @@ -10,7 +10,9 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. # the minimum version of shared-mime-database we require -set(SHARED_MIME_INFO_MINIMUM_VERSION "0.20") +if (NOT SHARED_MIME_INFO_MINIMUM_VERSION) + set(SHARED_MIME_INFO_MINIMUM_VERSION "0.18") +endif (NOT SHARED_MIME_INFO_MINIMUM_VERSION) if (UPDATE_MIME_DATABASE_EXECUTABLE) -- cgit v1.2.1 From 2d02ec4b5ec47afc13b03131f5ea0729426dff81 Mon Sep 17 00:00:00 2001 From: Sebastian Trueg Date: Mon, 21 Jan 2008 09:50:09 +0000 Subject: Honor Soprano_FIND_REQUIRED in version check svn path=/trunk/KDE/kdelibs/; revision=764199 --- modules/FindSoprano.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/FindSoprano.cmake b/modules/FindSoprano.cmake index 2f726db9..0cc278b0 100644 --- a/modules/FindSoprano.cmake +++ b/modules/FindSoprano.cmake @@ -100,7 +100,11 @@ STRING(REGEX REPLACE "SOPRANO_VERSION_STRING \"(.*)\"\n" "\\1" SOPRANO_VERSION ${SOPRANO_VERSION_MATCH}) if(SOPRANO_VERSION STRLESS "${SOPRANO_MIN_VERSION}") set(Soprano_FOUND FALSE) - message(FATAL_ERROR "Soprano version ${SOPRANO_VERSION} is too old. Please install ${SOPRANO_MIN_VERSION} or newer") + if(Soprano_FIND_REQUIRED) + message(FATAL_ERROR "Soprano version ${SOPRANO_VERSION} is too old. Please install ${SOPRANO_MIN_VERSION} or newer") + else(Soprano_FIND_REQUIRED) + message(STATUS "Soprano version ${SOPRANO_VERSION} is too old. Please install ${SOPRANO_MIN_VERSION} or newer") + endif(Soprano_FIND_REQUIRED) endif(SOPRANO_VERSION STRLESS "${SOPRANO_MIN_VERSION}") ENDIF (SOPRANO_VERSION_MATCH) endif(Soprano_FOUND) -- cgit v1.2.1 From b8f5228d282ad06a5d39b3f90ddfc8cfb60177a6 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Mon, 21 Jan 2008 14:23:09 +0000 Subject: Increase the GENERIC_VERSION strings. Probable relinking of all trunk will be needed once you build with the new string. svn path=/trunk/KDE/kdelibs/; revision=764348 --- modules/KDE4Defaults.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/KDE4Defaults.cmake b/modules/KDE4Defaults.cmake index b94eaf6d..d81b265e 100644 --- a/modules/KDE4Defaults.cmake +++ b/modules/KDE4Defaults.cmake @@ -27,10 +27,10 @@ set(CMAKE_USE_CHRPATH ON) # define the generic version of the libraries here # this makes it easy to advance it when the next KDE release comes -set(GENERIC_LIB_VERSION "4.0.0") +set(GENERIC_LIB_VERSION "4.1.0") set(GENERIC_LIB_SOVERSION "4") -set(KDE_NON_GENERIC_LIB_VERSION "5.0.0") +set(KDE_NON_GENERIC_LIB_VERSION "5.1.0") set(KDE_NON_GENERIC_LIB_SOVERSION "5") # windows does not support LD_LIBRARY_PATH or similar -- cgit v1.2.1 From e2b18201c68c201b33abb0b1ac1971ef48ef1c0a Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Tue, 22 Jan 2008 16:40:50 +0000 Subject: patch by dfaure so that the testfoo.shell wrapper is used when running 'make test' on Unix. We want to do this because testfoo.shell uses the runpath that points to our builddir, rather than installdir. this way, you no longer need to run make install before running make test. as discussed on kde-buildsystem svn path=/trunk/KDE/kdelibs/; revision=764809 --- modules/KDE4Macros.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index ffeb07c4..4d103d5e 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -776,6 +776,11 @@ macro (KDE4_ADD_UNIT_TEST _test_NAME) set(_executable ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME}) if (Q_WS_MAC AND NOT _nogui) set(_executable ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME}.app/Contents/MacOS/${_test_NAME}) + else (Q_WS_MAC AND NOT _nogui) + # Use .shell wrapper where available, to use uninstalled libs. + if (UNIX) + set(_executable ${_executable}.shell) + endif (UNIX) endif (Q_WS_MAC AND NOT _nogui) if (using_qtest AND KDE4_TEST_OUTPUT STREQUAL "xml") -- cgit v1.2.1 From 62286135802c3f0e8f4fce4046452b6bdbdc5f06 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 23 Jan 2008 08:54:19 +0000 Subject: Move here FindXine (use by kdebase and kdemultimedia) svn path=/trunk/KDE/kdelibs/; revision=765135 --- modules/FindXine.cmake | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 modules/FindXine.cmake diff --git a/modules/FindXine.cmake b/modules/FindXine.cmake new file mode 100644 index 00000000..65777ed8 --- /dev/null +++ b/modules/FindXine.cmake @@ -0,0 +1,69 @@ +# - Try to find the XINE library +# Once done this will define +# +# XINE_FOUND - system has the XINE library +# XINE_VERSION - XINE version +# XINE_BUGFIX_VERSION - the XINE bugfix version +# XINE_INCLUDE_DIR - the XINE include directory +# XINE_LIBRARY - The libraries needed to use XINE +# XINE_XCB_FOUND - libxine can use XCB for video output + +# Copyright (c) 2006,2007 Laurent Montel, +# Copyright (c) 2006, 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 (XINE_INCLUDE_DIR AND XINE_LIBRARY) + # Already in cache, be silent + set(Xine_FIND_QUIETLY TRUE) +endif (XINE_INCLUDE_DIR AND XINE_LIBRARY) + IF (NOT WIN32) + INCLUDE(UsePkgConfig) + PKGCONFIG(libxine _LibXineIncDir _LibXineLinkDir _LibXineLinkFlags _LibXineCflags) + EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS "--variable=prefix libxine" OUTPUT_VARIABLE _LibXinePrefix) + ENDIF (NOT WIN32) +FIND_PATH(XINE_INCLUDE_DIR NAMES xine.h + PATHS + ${_LibXineIncDir} + NO_DEFAULT_PATH) + +FIND_LIBRARY(XINE_LIBRARY NAMES xine + PATHS + ${_LibXineLinkDir} + NO_DEFAULT_PATH +) + +FIND_PROGRAM(XINECONFIG_EXECUTABLE NAMES xine-config PATHS + ${_LibXinePrefix}/bin +) + +if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE) + EXEC_PROGRAM(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION) + macro_ensure_version(1.1.1 ${XINE_VERSION} XINE_VERSION_OK) + if (XINE_VERSION_OK) + set(XINE_FOUND TRUE) + string(REGEX REPLACE "[0-9].[0-9]." "" XINE_BUGFIX_VERSION ${XINE_VERSION}) + endif (XINE_VERSION_OK) +endif (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE) + +INCLUDE(CheckCSourceCompiles) +SET(CMAKE_REQUIRED_INCLUDES ${XINE_INCLUDE_DIR}) +SET(CMAKE_REQUIRED_LIBRARIES ${XINE_LIBRARY}) +CHECK_C_SOURCE_COMPILES("#include \nint main()\n{\n xine_open_video_driver(xine_new(), \"auto\", XINE_VISUAL_TYPE_XCB, NULL);\n return 0;\n}\n" XINE_XCB_FOUND) + +if (XINE_FOUND) + if (NOT Xine_FIND_QUIETLY) + message(STATUS "Found XINE: ${XINE_LIBRARY}") + endif (NOT Xine_FIND_QUIETLY) + # if(XINECONFIG_EXECUTABLE) + # EXEC_PROGRAM(${XINECONFIG_EXECUTABLE} ARGS --plugindir RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINEPLUGINSDIR) + # MESSAGE(STATUS "XINEPLUGINSDIR :<${XINEPLUGINSDIR}>") + # endif(XINECONFIG_EXECUTABLE) +else (XINE_FOUND) + if (Xine_FIND_REQUIRED) + message(FATAL_ERROR "Could NOT find XINE 1.1.1 or greater") + endif (Xine_FIND_REQUIRED) +endif (XINE_FOUND) + +MARK_AS_ADVANCED(XINE_INCLUDE_DIR XINE_LIBRARY) -- cgit v1.2.1 From d1d57cb86dc8890ae1995ae993ca2c8b424bd330 Mon Sep 17 00:00:00 2001 From: Marcus Hufgard Date: Mon, 28 Jan 2008 06:20:49 +0000 Subject: standard compiled ruby 1.9.0 has problems with the include dir. Fixed it svn path=/trunk/KDE/kdelibs/; revision=767485 --- modules/FindRUBY.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FindRUBY.cmake b/modules/FindRUBY.cmake index ee44bae2..8696bb49 100644 --- a/modules/FindRUBY.cmake +++ b/modules/FindRUBY.cmake @@ -57,7 +57,7 @@ IF(RUBY_EXECUTABLE) FIND_PATH(RUBY_INCLUDE_PATH NAMES ruby.h - PATHS ${RUBY_ARCH_DIR} + PATHS ${RUBY_ARCH_DIR} /usr/include/ruby-${RUBY_VERSION} ) FIND_LIBRARY(RUBY_LIBRARY -- cgit v1.2.1 From 542ce625fe5ab6bbfbfe1ea8a8909695f5cf7788 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Mon, 28 Jan 2008 14:53:28 +0000 Subject: Support FLAC > 1.1.2. This does not remove support for FLAC 1.1.2. BUG: 153503 svn path=/trunk/KDE/kdelibs/; revision=767695 --- modules/FindFlac.cmake | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/FindFlac.cmake b/modules/FindFlac.cmake index f1f54c42..0be8a407 100644 --- a/modules/FindFlac.cmake +++ b/modules/FindFlac.cmake @@ -5,6 +5,9 @@ # FLAC_INCLUDE_DIR - the Flac include directory # FLAC_LIBRARIES - Link these to use Flac # FLAC_OGGFLAC_LIBRARIES - Link these to use OggFlac +# +# No version checking is done - use FLAC_API_VERSION_CURRENT to +# conditionally compile version-dependent code # Copyright (c) 2006, Laurent Montel, # Copyright (c) 2006, Alexander Neundorf, @@ -23,18 +26,16 @@ FIND_LIBRARY(FLAC_LIBRARIES NAMES FLAC ) FIND_LIBRARY(FLAC_OGG_LIBRARY NAMES OggFLAC) -check_library_exists(FLAC FLAC__stream_encoder_set_write_callback "" HAVE_STREAM_ENCODER_WRITE_CALLBACK) - -IF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES AND HAVE_STREAM_ENCODER_WRITE_CALLBACK) +IF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES) SET(FLAC_FOUND TRUE) IF (FLAC_OGG_LIBRARY) SET(FLAC_OGGFLAC_LIBRARIES ${FLAC_OGG_LIBRARY} ${FLAC_LIBRARIES}) ENDIF (FLAC_OGG_LIBRARY) -ELSE(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES AND HAVE_STREAM_ENCODER_WRITE_CALLBACK) +ELSE(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES) SET(FLAC_FOUND FALSE) -ENDIF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES AND HAVE_STREAM_ENCODER_WRITE_CALLBACK) +ENDIF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES) IF(FLAC_FOUND) IF(NOT Flac_FIND_QUIETLY) -- cgit v1.2.1 From bcd5fdef70451265c32438238131962ed23f69c8 Mon Sep 17 00:00:00 2001 From: Chusslove Illich Date: Tue, 29 Jan 2008 08:35:30 +0000 Subject: Add support to install localized icons. svn path=/trunk/KDE/kdelibs/; revision=768063 --- modules/KDE4Macros.cmake | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 4d103d5e..b449b05e 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -406,7 +406,7 @@ set(_KDE4_ICON_THEME_hi "hicolor") # only used internally by KDE4_INSTALL_ICONS -macro (_KDE4_ADD_ICON_INSTALL_RULE _install_SCRIPT _install_PATH _group _orig_NAME _install_NAME) +macro (_KDE4_ADD_ICON_INSTALL_RULE _install_SCRIPT _install_PATH _group _orig_NAME _install_NAME _l10n_SUBDIR) # if the string doesn't match the pattern, the result is the full string, so all three have the same content if (NOT ${_group} STREQUAL ${_install_NAME} ) @@ -414,8 +414,8 @@ macro (_KDE4_ADD_ICON_INSTALL_RULE _install_SCRIPT _install_PATH _group _orig_NA if(NOT _icon_GROUP) set(_icon_GROUP "actions") endif(NOT _icon_GROUP) -# message(STATUS "icon: ${_current_ICON} size: ${_size} group: ${_group} name: ${_name}" ) - install(FILES ${_orig_NAME} DESTINATION ${_install_PATH}/${_icon_GROUP}/ RENAME ${_install_NAME} ) +# message(STATUS "icon: ${_current_ICON} size: ${_size} group: ${_group} name: ${_name} l10n: ${_l10n_SUBDIR}") + install(FILES ${_orig_NAME} DESTINATION ${_install_PATH}/${_icon_GROUP}/${_l10n_SUBDIR}/ RENAME ${_install_NAME} ) endif (NOT ${_group} STREQUAL ${_install_NAME} ) endmacro (_KDE4_ADD_ICON_INSTALL_RULE) @@ -423,6 +423,14 @@ endmacro (_KDE4_ADD_ICON_INSTALL_RULE) macro (KDE4_INSTALL_ICONS _defaultpath ) + # the l10n-subdir if language given as second argument (localized icon) + set(_lang ${ARGV1}) + if(_lang) + set(_l10n_SUBDIR l10n/${_lang}) + else(_lang) + set(_l10n_SUBDIR ".") + endif(_lang) + # first the png icons file(GLOB _icons *.png) foreach (_current_ICON ${_icons} ) @@ -435,7 +443,7 @@ macro (KDE4_INSTALL_ICONS _defaultpath ) if( _theme_GROUP) _KDE4_ADD_ICON_INSTALL_RULE(${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake ${_defaultpath}/${_theme_GROUP}/${_size}x${_size} - ${_group} ${_current_ICON} ${_name}) + ${_group} ${_current_ICON} ${_name} ${_l10n_SUBDIR}) endif( _theme_GROUP) endforeach (_current_ICON) @@ -451,7 +459,7 @@ macro (KDE4_INSTALL_ICONS _defaultpath ) if( _theme_GROUP) _KDE4_ADD_ICON_INSTALL_RULE(${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake ${_defaultpath}/${_theme_GROUP}/${_size}x${_size} - ${_group} ${_current_ICON} ${_name}) + ${_group} ${_current_ICON} ${_name} ${_l10n_SUBDIR}) endif( _theme_GROUP) endforeach (_current_ICON) @@ -466,7 +474,7 @@ macro (KDE4_INSTALL_ICONS _defaultpath ) if( _theme_GROUP) _KDE4_ADD_ICON_INSTALL_RULE(${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake ${_defaultpath}/${_theme_GROUP}/scalable - ${_group} ${_current_ICON} ${_name}) + ${_group} ${_current_ICON} ${_name} ${_l10n_SUBDIR}) endif( _theme_GROUP) endforeach (_current_ICON) -- cgit v1.2.1 From e396eb931ba793d36edb09f4201738bf8f782fc9 Mon Sep 17 00:00:00 2001 From: David Johnson Date: Tue, 29 Jan 2008 17:21:00 +0000 Subject: adjust order of includes svn path=/trunk/KDE/kdelibs/; revision=768283 --- modules/FindKDE4Internal.cmake | 2 +- modules/FindQt4.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 7b71836b..ef6578c1 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -1030,7 +1030,7 @@ endif (NOT KDE4Internal_FIND_QUIETLY) #add the found Qt and KDE include directories to the current include path #the ${KDE4_INCLUDE_DIR}/KDE directory is for forwarding includes, eg. #include -set(KDE4_INCLUDES ${QT_INCLUDES} ${KDE4_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}/KDE ${_KDE4_PLATFORM_INCLUDE_DIRS} ) +set(KDE4_INCLUDES ${KDE4_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}/KDE ${_KDE4_PLATFORM_INCLUDE_DIRS} ${QT_INCLUDES} ) set(KDE4_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} -DQT_NO_STL -DQT_NO_CAST_TO_ASCII -D_REENTRANT -DKDE_DEPRECATED_WARNINGS ) diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 0ad173a0..f8d0f562 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -604,7 +604,7 @@ IF (QT4_QMAKE_FOUND) MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_QT_INCLUDE_DIR QT_DOC_DIR QT_MKSPECS_DIR QT_PLUGINS_DIR) # Set QT_INCLUDES - SET( QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default ) + SET( QT_INCLUDES ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR}) ######################################## @@ -833,7 +833,7 @@ IF (QT4_QMAKE_FOUND) IF (QT_${basename}_INCLUDE_DIR) #add the include directory to QT_INCLUDES - SET(QT_INCLUDES ${QT_INCLUDES} "${QT_${basename}_INCLUDE_DIR}") + SET(QT_INCLUDES "${QT_${basename}_INCLUDE_DIR}" ${QT_INCLUDES}) ENDIF (QT_${basename}_INCLUDE_DIR) # Make variables changeble to the advanced user -- cgit v1.2.1 From c926f96b573c3a4182078603e9c37d7c375a442f Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 31 Jan 2008 20:48:09 +0000 Subject: Fix problem when pcre is installed after a first configure svn path=/trunk/KDE/kdelibs/; revision=769201 --- modules/FindPCRE.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/FindPCRE.cmake b/modules/FindPCRE.cmake index e18b109d..b39d8875 100644 --- a/modules/FindPCRE.cmake +++ b/modules/FindPCRE.cmake @@ -11,10 +11,10 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -if (PCRE_INCLUDE_DIR AND PCRE_LIBRARIES AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY) +if (PCRE_INCLUDE_DIR AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY) # Already in cache, be silent set(PCRE_FIND_QUIETLY TRUE) -endif (PCRE_INCLUDE_DIR AND PCRE_LIBRARIES AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY) +endif (PCRE_INCLUDE_DIR AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY) FIND_PATH(PCRE_INCLUDE_DIR pcre.h PATH_SUFFIXES pcre) @@ -22,9 +22,9 @@ FIND_LIBRARY(PCRE_PCRE_LIBRARY NAMES pcre) FIND_LIBRARY(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix) -set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY} CACHE STRING "The libraries needed to use PCRE") - include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_LIBRARIES ) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_PCRE_LIBRARY PCRE_PCREPOSIX_LIBRARY ) + +set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY} CACHE STRING "The libraries needed to use PCRE") MARK_AS_ADVANCED(PCRE_INCLUDE_DIR PCRE_LIBRARIES PCRE_PCREPOSIX_LIBRARY PCRE_PCRE_LIBRARY) -- cgit v1.2.1 From 8a87d51e236488bcb4ffd1e6a7ffaa75026ac102 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 2 Feb 2008 14:57:05 +0000 Subject: Even two jobs is problematic on FreeBSD - confirmed with Alex a month ago or so. svn path=/trunk/KDE/kdelibs/; revision=769986 --- automoc/kde4automoc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automoc/kde4automoc.cpp b/automoc/kde4automoc.cpp index da0d5457..4985d74b 100644 --- a/automoc/kde4automoc.cpp +++ b/automoc/kde4automoc.cpp @@ -314,7 +314,7 @@ void AutoMoc::generateMoc(const QString &sourceFile, const QString &mocFileName) // we don't want too many child processes #ifdef Q_OS_FREEBSD - static const int max_processes = 1; + static const int max_processes = 0; #else static const int max_processes = 10; #endif -- cgit v1.2.1 From c32d4c98e1d154025d68baa0fa837e99fce86b15 Mon Sep 17 00:00:00 2001 From: Sebastian Trueg Date: Sat, 2 Feb 2008 16:23:27 +0000 Subject: Use the new --quiet parameter to suppress useless output svn path=/trunk/KDE/kdelibs/; revision=770030 --- modules/NepomukMacros.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/NepomukMacros.cmake b/modules/NepomukMacros.cmake index 9476cf64..00771ae6 100644 --- a/modules/NepomukMacros.cmake +++ b/modules/NepomukMacros.cmake @@ -28,22 +28,22 @@ macro(NEPOMUK_GENERATE_FROM_ONTOLOGY ontofile targetdir out_headers out_sources FILE(TO_NATIVE_PATH ${RCGEN} RCGEN) execute_process( - COMMAND ${RCGEN} --listheaders --prefix ${targetdir}/ --ontologies ${ontofile} + COMMAND ${RCGEN} --quiet --listheaders --prefix ${targetdir}/ --ontologies ${ontofile} OUTPUT_VARIABLE ${out_headers} ) execute_process( - COMMAND ${RCGEN} --listsources --prefix ${targetdir}/ --ontologies ${ontofile} + COMMAND ${RCGEN} --quiet --listsources --prefix ${targetdir}/ --ontologies ${ontofile} OUTPUT_VARIABLE ${out_sources} ) execute_process( - COMMAND ${RCGEN} --listincludes --ontologies ${ontofile} + COMMAND ${RCGEN} --quiet --listincludes --ontologies ${ontofile} OUTPUT_VARIABLE ${out_includes} ) execute_process( - COMMAND ${RCGEN} --writeall --templates ${ARGN} --target ${targetdir}/ --ontologies ${ontofile} + COMMAND ${RCGEN} --quiet --writeall --templates ${ARGN} --target ${targetdir}/ --ontologies ${ontofile} ) endmacro(NEPOMUK_GENERATE_FROM_ONTOLOGY) -- cgit v1.2.1 From 5950ab2665426d9fad7a6c81a740c39a215a720d Mon Sep 17 00:00:00 2001 From: David Johnson Date: Sat, 2 Feb 2008 21:14:08 +0000 Subject: Place Qt includes before platform/X11 includes svn path=/trunk/KDE/kdelibs/; revision=770126 --- modules/FindKDE4Internal.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index ef6578c1..c1981470 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -1030,7 +1030,7 @@ endif (NOT KDE4Internal_FIND_QUIETLY) #add the found Qt and KDE include directories to the current include path #the ${KDE4_INCLUDE_DIR}/KDE directory is for forwarding includes, eg. #include -set(KDE4_INCLUDES ${KDE4_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}/KDE ${_KDE4_PLATFORM_INCLUDE_DIRS} ${QT_INCLUDES} ) +set(KDE4_INCLUDES ${KDE4_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}/KDE ${QT_INCLUDES} ${_KDE4_PLATFORM_INCLUDE_DIRS} ) set(KDE4_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} -DQT_NO_STL -DQT_NO_CAST_TO_ASCII -D_REENTRANT -DKDE_DEPRECATED_WARNINGS ) -- cgit v1.2.1 From 1ed1dcce2c979c8b706f81a042c712e2fb00cef0 Mon Sep 17 00:00:00 2001 From: Sebastian Trueg Date: Sat, 2 Feb 2008 21:47:29 +0000 Subject: Reverted to version without --quiet parameter to be backwards compatible svn path=/trunk/KDE/kdelibs/; revision=770138 --- modules/NepomukMacros.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/NepomukMacros.cmake b/modules/NepomukMacros.cmake index 00771ae6..9476cf64 100644 --- a/modules/NepomukMacros.cmake +++ b/modules/NepomukMacros.cmake @@ -28,22 +28,22 @@ macro(NEPOMUK_GENERATE_FROM_ONTOLOGY ontofile targetdir out_headers out_sources FILE(TO_NATIVE_PATH ${RCGEN} RCGEN) execute_process( - COMMAND ${RCGEN} --quiet --listheaders --prefix ${targetdir}/ --ontologies ${ontofile} + COMMAND ${RCGEN} --listheaders --prefix ${targetdir}/ --ontologies ${ontofile} OUTPUT_VARIABLE ${out_headers} ) execute_process( - COMMAND ${RCGEN} --quiet --listsources --prefix ${targetdir}/ --ontologies ${ontofile} + COMMAND ${RCGEN} --listsources --prefix ${targetdir}/ --ontologies ${ontofile} OUTPUT_VARIABLE ${out_sources} ) execute_process( - COMMAND ${RCGEN} --quiet --listincludes --ontologies ${ontofile} + COMMAND ${RCGEN} --listincludes --ontologies ${ontofile} OUTPUT_VARIABLE ${out_includes} ) execute_process( - COMMAND ${RCGEN} --quiet --writeall --templates ${ARGN} --target ${targetdir}/ --ontologies ${ontofile} + COMMAND ${RCGEN} --writeall --templates ${ARGN} --target ${targetdir}/ --ontologies ${ontofile} ) endmacro(NEPOMUK_GENERATE_FROM_ONTOLOGY) -- cgit v1.2.1 From 5006fea71975220db9abf436e9f6dcea3e94f2f0 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 5 Feb 2008 16:38:41 +0000 Subject: Add more library to the GStreamer library search. Note: the gstreamer 0.10 package comes with 5 libraries and we only check for one. In addition, we check for a library that comes from the gstreamer-plugins-base 0.10 package. I suggest this be cleaned up. The extra library can go into FindGStreamerPlugins.cmake file. svn path=/trunk/KDE/kdelibs/; revision=771265 --- modules/FindGStreamer.cmake | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/modules/FindGStreamer.cmake b/modules/FindGStreamer.cmake index 2d752dd9..4398f150 100644 --- a/modules/FindGStreamer.cmake +++ b/modules/FindGStreamer.cmake @@ -10,12 +10,12 @@ # TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_0_10_FOUND etc) -IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY) +IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) # in cache already SET(GStreamer_FIND_QUIETLY TRUE) -ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY) +ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) SET(GStreamer_FIND_QUIETLY FALSE) -ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY) +ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) IF (NOT WIN32) # use pkg-config to get the directories and then use these values @@ -40,6 +40,11 @@ FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-0.10 ${_GStreamerLinkDir} ) +FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-0.10 + PATHS + ${_GStreamerLinkDir} + ) + FIND_LIBRARY(GSTREAMER_INTERFACE_LIBRARY NAMES gstinterfaces-0.10 PATHS ${_GStreamerLinkDir} @@ -63,11 +68,11 @@ ELSE (GSTREAMER_INTERFACE_LIBRARY) MESSAGE(STATUS "GStreamer: WARNING: interface library not found") ENDIF (GSTREAMER_INTERFACE_LIBRARY) -IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY) +IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) SET(GSTREAMER_FOUND TRUE) -ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY) +ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) SET(GSTREAMER_FOUND FALSE) -ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY) +ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) IF (GSTREAMER_FOUND) IF (NOT GStreamer_FIND_QUIETLY) @@ -79,4 +84,4 @@ ELSE (GSTREAMER_FOUND) ENDIF (GStreamer_FIND_REQUIRED) ENDIF (GSTREAMER_FOUND) -MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_INTERFACE_LIBRARY) +MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY) -- cgit v1.2.1 From 00ae2e735f5b0ce4d9b833c82b49dfa56daccfba Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Sat, 9 Feb 2008 19:31:57 +0000 Subject: microoptimization const & in foreach svn path=/trunk/KDE/kdelibs/; revision=772931 --- automoc/kde4automoc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automoc/kde4automoc.cpp b/automoc/kde4automoc.cpp index 4985d74b..dd1d362e 100644 --- a/automoc/kde4automoc.cpp +++ b/automoc/kde4automoc.cpp @@ -196,7 +196,7 @@ bool AutoMoc::run() basename = basename.right(basename.length() - 4); } bool headerFound = false; - foreach (QString ext, headerExtensions) { + foreach (const QString &ext, headerExtensions) { QString sourceFilePath = absPath + basename + ext; if (QFile::exists(sourceFilePath)) { headerFound = true; -- cgit v1.2.1 From e5c7745dccc9b29354812f53edb77163574028ae Mon Sep 17 00:00:00 2001 From: Sebastian Trueg Date: Mon, 11 Feb 2008 17:29:18 +0000 Subject: Make it possible to get the result from the nepomuk code gen call svn path=/trunk/KDE/kdelibs/; revision=773741 --- modules/NepomukMacros.cmake | 64 ++++++++++++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 21 deletions(-) diff --git a/modules/NepomukMacros.cmake b/modules/NepomukMacros.cmake index 9476cf64..18aeca27 100644 --- a/modules/NepomukMacros.cmake +++ b/modules/NepomukMacros.cmake @@ -18,32 +18,54 @@ # # In addition to the parameters an arbitrary number of template filenames can be set as arguments # +# In case of success NEPOMUK_RESOURCES_GENERATED is true, otherwise false +# macro(NEPOMUK_GENERATE_FROM_ONTOLOGY ontofile targetdir out_headers out_sources out_includes) + # init + set(NEPOMUK_RESOURCES_GENERATED false) + FIND_PROGRAM(RCGEN nepomuk-rcgen PATHS ${BIN_INSTALL_DIR}) + if(NOT RCGEN) - message( FATAL_ERROR "Failed to find the KMetaData source generator" ) - endif(NOT RCGEN) - FILE(TO_NATIVE_PATH ${RCGEN} RCGEN) + message(STATUS "Failed to find the Nepomuk source generator" ) - execute_process( - COMMAND ${RCGEN} --listheaders --prefix ${targetdir}/ --ontologies ${ontofile} - OUTPUT_VARIABLE ${out_headers} - ) - - execute_process( - COMMAND ${RCGEN} --listsources --prefix ${targetdir}/ --ontologies ${ontofile} - OUTPUT_VARIABLE ${out_sources} - ) - - execute_process( - COMMAND ${RCGEN} --listincludes --ontologies ${ontofile} - OUTPUT_VARIABLE ${out_includes} - ) - - execute_process( - COMMAND ${RCGEN} --writeall --templates ${ARGN} --target ${targetdir}/ --ontologies ${ontofile} - ) + else(NOT RCGEN) + + FILE(TO_NATIVE_PATH ${RCGEN} RCGEN) + + execute_process( + COMMAND ${RCGEN} --listheaders --prefix ${targetdir}/ --ontologies ${ontofile} + OUTPUT_VARIABLE ${out_headers} + RESULT_VARIABLE rcgen_result + ) + + # If the first call succeeds it is very very likely that the rest will, too + if(${rcgen_result} EQUAL 0) + + execute_process( + COMMAND ${RCGEN} --listsources --prefix ${targetdir}/ --ontologies ${ontofile} + OUTPUT_VARIABLE ${out_sources} + ) + + execute_process( + COMMAND ${RCGEN} --listincludes --ontologies ${ontofile} + OUTPUT_VARIABLE ${out_includes} + ) + + execute_process( + COMMAND ${RCGEN} --writeall --templates ${ARGN} --target ${targetdir}/ --ontologies ${ontofile} + ) + + set(NEPOMUK_RESOURCES_GENERATED true) + + else(${rcgen_result} EQUAL 0) + + message(STATUS "Failed to generate Nepomuk resource classes.") + + endif(${rcgen_result} EQUAL 0) + + endif(NOT RCGEN) endmacro(NEPOMUK_GENERATE_FROM_ONTOLOGY) -- cgit v1.2.1 From 689357faa3e04ecefa15a80d7044714cb502aa5f Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Tue, 12 Feb 2008 12:36:17 +0000 Subject: - win32 compile fix: kdecore's CMakeLists.txt says that kdefakes is only build on unix which implies that the library should only be searched on unix svn path=/trunk/KDE/kdelibs/; revision=774067 --- modules/FindKDE4Internal.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index c1981470..494986ea 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -340,8 +340,10 @@ else (_kdeBootStrapping) # this file contains all dependencies of all libraries of kdelibs, Alex include(${kde_cmake_module_dir}/KDELibsDependencies.cmake) +if (UNIX) find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) set(KDE4_KDEFAKES_LIBS ${kdefakes_LIB_DEPENDS} ${KDE4_KDEFAKES_LIBRARY} ) +endif find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) set(KDE4_KDECORE_LIBS ${kdecore_LIB_DEPENDS} ${KDE4_KDECORE_LIBRARY} ) -- cgit v1.2.1 From 776c62413b3857305f9fdfea2aa81d01b18ab271 Mon Sep 17 00:00:00 2001 From: Andras Mantia Date: Tue, 12 Feb 2008 13:41:13 +0000 Subject: Fix cmake file. svn path=/trunk/KDE/kdelibs/; revision=774091 --- modules/FindKDE4Internal.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 494986ea..c4f85cfc 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -340,10 +340,10 @@ else (_kdeBootStrapping) # this file contains all dependencies of all libraries of kdelibs, Alex include(${kde_cmake_module_dir}/KDELibsDependencies.cmake) -if (UNIX) - find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) - set(KDE4_KDEFAKES_LIBS ${kdefakes_LIB_DEPENDS} ${KDE4_KDEFAKES_LIBRARY} ) -endif + if (UNIX) + find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + set(KDE4_KDEFAKES_LIBS ${kdefakes_LIB_DEPENDS} ${KDE4_KDEFAKES_LIBRARY} ) + endif (UNIX) find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) set(KDE4_KDECORE_LIBS ${kdecore_LIB_DEPENDS} ${KDE4_KDECORE_LIBRARY} ) -- cgit v1.2.1 From 331a478cded22cc2a6f7d8223e0ead4c27d7b4a3 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 15 Feb 2008 08:21:59 +0000 Subject: Add new variable for new lib But qt-copy doesn't install QtClucene include Thiago ? CCMAIL: thiago@kde.org svn path=/trunk/KDE/kdelibs/; revision=775219 --- modules/FindQt4.cmake | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index f8d0f562..33181109 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -24,6 +24,11 @@ # QT_USE_QTUITOOLS # QT_USE_QTDBUS # QT_USE_QTSCRIPT +# QT_USE_QTCLUCENE +# QT_USE_QTASSISTANTCLIENT +# QT_USE_QTHELP +# QT_USE_QTWEBKIT +# QT_USE_QTXMLPATTERNS # # All the libraries required are stored in a variable called QT_LIBRARIES. # Add this variable to your TARGET_LINK_LIBRARIES. @@ -96,6 +101,11 @@ # QT_QTSCRIPT_FOUND True if QtScript was found. # QT_QTTEST_FOUND True if QtTest was found. # QT_QTUITOOLS_FOUND True if QtUiTools was found. +# QT_QTCLUCENE_FOUND True if QtClucene was found. +# QT_QTASSISTANTCLIENT_FOUND True if QtAssistantClient was found. +# QT_QTHELP_FOUND True if QtHelp was found. +# QT_QTWEBKIT_FOUND True if QtWebKit was found. +# QT_QTXMLPATTERNS_FOUND True if QtXmlPatterns was found. # # QT_DEFINITIONS Definitions to use when compiling code that uses Qt. # @@ -123,6 +133,11 @@ # QT_QTSVG_INCLUDE_DIR Path to "include/QtSvg" # QT_QTSCRIPT_INCLUDE_DIR Path to "include/QtScript" # QT_QTTEST_INCLUDE_DIR Path to "include/QtTest" +# QT_QTCLUCENE_INCLUDE_DIR Path to "include/QtClucene" +# QT_QTASSISTANTCLIENT_INCLUDE_DIR Path to "include/QtAssistant" +# QT_QTHELP_INCLUDE_DIR Path to "include/QtHelp" +# QT_QTWEBKIT_INCLUDE_DIR Path to "include/QtWebKit" +# QT_QTXMLPATTERNS_INCLUDE_DIR Path to "include/QtXmlPatterns" # # QT_LIBRARY_DIR Path to "lib" of Qt4 # @@ -166,6 +181,20 @@ # The qtmain library for Windows QT_QTMAIN_LIBRARY # # The QtUiTools library: QT_QTUITOOLS_LIBRARY + +# +# The QtClucene library: QT_QTCLUCENE_LIBRARY +# +# The QtAssistantClient library: QT_QTASSISTANTCLIENT_LIBRARY +# +# The QtHelp library: QT_QTHELP_LIBRARY +# +# The QtWebKit library: QT_QTWEBKIT_LIBRARY +# +# The QtXmlPatterns library: QT_QTXMLPATTERNS_LIBRARY + + + # # also defined, but NOT for general use are # QT_MOC_EXECUTABLE Where to find the moc tool. @@ -600,6 +629,41 @@ IF (QT4_QMAKE_FOUND) NO_DEFAULT_PATH ) + # Set QT_QTDBUS_CLUCENE_DIR + FIND_PATH(QT_QTCLUCENE_INCLUDE_DIR QtClucene + PATHS + ${QT_INCLUDE_DIR}/QtClucene + ${QT_HEADERS_DIR}/QtClucene + NO_DEFAULT_PATH + ) + # Set QT_QTASSISTANTCLIENT_INCLUDE_DIR + FIND_PATH(QT_QTASSISTANTCLIENT_INCLUDE_DIR QtAssistantClient + PATHS + ${QT_INCLUDE_DIR}/QtAssistant + ${QT_HEADERS_DIR}/QtAssistant + NO_DEFAULT_PATH + ) + # Set QT_QTHELP_INCLUDE_DIR + FIND_PATH(QT_QTHELP_INCLUDE_DIR QtHelp + PATHS + ${QT_INCLUDE_DIR}/QtHelp + ${QT_HEADERS_DIR}/QtHelp + NO_DEFAULT_PATH + ) + # Set QT_QTWEBKIT_INCLUDE_DIR + FIND_PATH(QT_QTWEBKIT_INCLUDE_DIR QtWebKit + PATHS + ${QT_INCLUDE_DIR}/QtWebKit + ${QT_HEADERS_DIR}/QtWebKit + NO_DEFAULT_PATH + ) + # Set QT_QTXMLPATTERNS_INCLUDE_DIR + FIND_PATH(QT_QTXMLPATTERNS_INCLUDE_DIR QtXmlPatterns + PATHS + ${QT_INCLUDE_DIR}/QtXmlPatterns + ${QT_HEADERS_DIR}/QtXmlPatterns + NO_DEFAULT_PATH + ) # Make variables changeble to the advanced user MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_QT_INCLUDE_DIR QT_DOC_DIR QT_MKSPECS_DIR QT_PLUGINS_DIR) @@ -686,6 +750,35 @@ IF (QT4_QMAKE_FOUND) SET(QT_QTTEST_FOUND FALSE) ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtTest.framework) + IF(EXISTS ${QT_LIBRARY_DIR}/QtClucene.framework) + SET(QT_QTCLUCENE_FOUND TRUE) + SET(QT_QTCLUCENE_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtClucene" CACHE STRING "The QtClucene library.") + ELSE(EXISTS ${QT_LIBRARY_DIR}/QtClucene.framework) + SET(QT_QTCLUCENE_FOUND FALSE) + ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtClucene.framework) + + IF(EXISTS ${QT_LIBRARY_DIR}/QtAssistantClient.framework) + SET(QT_QTASSISTANTCLIENT_FOUND TRUE) + SET(QT_QTASSISTANTCLIENT_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtAssistantClient" CACHE STRING "The QtAssistantClient library.") + ELSE(EXISTS ${QT_LIBRARY_DIR}/QtAssistantClient.framework) + SET(QT_QTASSISTANTCLIENT_FOUND FALSE) + ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtAssistantClient.framework) + + IF(EXISTS ${QT_LIBRARY_DIR}/QtWebKit.framework) + SET(QT_QTWEBKIT_FOUND TRUE) + SET(QT_QTWEBKIT_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtWebKit" CACHE STRING "The QtWebKit library.") + ELSE(EXISTS ${QT_LIBRARY_DIR}/QtWebKit.framework) + SET(QT_QTWEBKIT_FOUND FALSE) + ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtWebKit.framework) + + IF(EXISTS ${QT_LIBRARY_DIR}/QtXmlPatterns.framework) + SET(QT_QTXMLPATTERNS_FOUND TRUE) + SET(QT_QTXMLPATTERNS_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtXmlPatterns" CACHE STRING "The QtXmlPatterns library.") + ELSE(EXISTS ${QT_LIBRARY_DIR}/QtXmlPatterns.framework) + SET(QT_QTXMLPATTERNS_FOUND FALSE) + ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtTest.framework) + + # WTF? why don't we have frameworks? :P # Set QT_QTUITOOLS_LIBRARY FIND_LIBRARY(QT_QTUITOOLS_LIBRARY NAMES QtUiTools QtUiTools4 PATHS ${QT_LIBRARY_DIR} ) @@ -737,6 +830,17 @@ IF (QT4_QMAKE_FOUND) FIND_LIBRARY(QT_QTDBUS_LIBRARY NAMES QtDBus QtDBus4 QtDBusd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) + FIND_LIBRARY(QT_QTCLUCENE_LIBRARY NAMES QtClucene QtClucene4 QtClucened4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) + + FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY NAMES QtAssistantClient QtAssistantClient4 QtAssistantClientd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) + + FIND_LIBRARY(QT_QTHELP_LIBRARY NAMES QtHelp QtHelp4 QtHelpd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) + + FIND_LIBRARY(QT_QTWEBKIT_LIBRARY NAMES QtWebKit QtWebKit4 QtWebKitd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) + + FIND_LIBRARY(QT_QTXMLPATTERNS_LIBRARY NAMES QtXmlPatterns QtXmlPatterns4 QtXmlPatternsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) + + IF(MSVC) FIND_LIBRARY(QT_QTCORE_LIBRARY_RELEASE NAMES QtCore4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) FIND_LIBRARY(QT_QTCORE_LIBRARY_DEBUG NAMES QtCored4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) -- cgit v1.2.1 From 901763fc5f2362ca3f1d11298fa14f88442b6207 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 15 Feb 2008 08:40:42 +0000 Subject: QtClucene doesn't have public API svn path=/trunk/KDE/kdelibs/; revision=775229 --- modules/FindQt4.cmake | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 33181109..e5798f6b 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -24,7 +24,6 @@ # QT_USE_QTUITOOLS # QT_USE_QTDBUS # QT_USE_QTSCRIPT -# QT_USE_QTCLUCENE # QT_USE_QTASSISTANTCLIENT # QT_USE_QTHELP # QT_USE_QTWEBKIT @@ -101,7 +100,6 @@ # QT_QTSCRIPT_FOUND True if QtScript was found. # QT_QTTEST_FOUND True if QtTest was found. # QT_QTUITOOLS_FOUND True if QtUiTools was found. -# QT_QTCLUCENE_FOUND True if QtClucene was found. # QT_QTASSISTANTCLIENT_FOUND True if QtAssistantClient was found. # QT_QTHELP_FOUND True if QtHelp was found. # QT_QTWEBKIT_FOUND True if QtWebKit was found. @@ -133,7 +131,6 @@ # QT_QTSVG_INCLUDE_DIR Path to "include/QtSvg" # QT_QTSCRIPT_INCLUDE_DIR Path to "include/QtScript" # QT_QTTEST_INCLUDE_DIR Path to "include/QtTest" -# QT_QTCLUCENE_INCLUDE_DIR Path to "include/QtClucene" # QT_QTASSISTANTCLIENT_INCLUDE_DIR Path to "include/QtAssistant" # QT_QTHELP_INCLUDE_DIR Path to "include/QtHelp" # QT_QTWEBKIT_INCLUDE_DIR Path to "include/QtWebKit" @@ -182,8 +179,6 @@ # # The QtUiTools library: QT_QTUITOOLS_LIBRARY -# -# The QtClucene library: QT_QTCLUCENE_LIBRARY # # The QtAssistantClient library: QT_QTASSISTANTCLIENT_LIBRARY # @@ -628,14 +623,6 @@ IF (QT4_QMAKE_FOUND) ${QT_HEADERS_DIR}/QtDBus NO_DEFAULT_PATH ) - - # Set QT_QTDBUS_CLUCENE_DIR - FIND_PATH(QT_QTCLUCENE_INCLUDE_DIR QtClucene - PATHS - ${QT_INCLUDE_DIR}/QtClucene - ${QT_HEADERS_DIR}/QtClucene - NO_DEFAULT_PATH - ) # Set QT_QTASSISTANTCLIENT_INCLUDE_DIR FIND_PATH(QT_QTASSISTANTCLIENT_INCLUDE_DIR QtAssistantClient PATHS @@ -750,13 +737,6 @@ IF (QT4_QMAKE_FOUND) SET(QT_QTTEST_FOUND FALSE) ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtTest.framework) - IF(EXISTS ${QT_LIBRARY_DIR}/QtClucene.framework) - SET(QT_QTCLUCENE_FOUND TRUE) - SET(QT_QTCLUCENE_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtClucene" CACHE STRING "The QtClucene library.") - ELSE(EXISTS ${QT_LIBRARY_DIR}/QtClucene.framework) - SET(QT_QTCLUCENE_FOUND FALSE) - ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtClucene.framework) - IF(EXISTS ${QT_LIBRARY_DIR}/QtAssistantClient.framework) SET(QT_QTASSISTANTCLIENT_FOUND TRUE) SET(QT_QTASSISTANTCLIENT_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtAssistantClient" CACHE STRING "The QtAssistantClient library.") @@ -830,8 +810,6 @@ IF (QT4_QMAKE_FOUND) FIND_LIBRARY(QT_QTDBUS_LIBRARY NAMES QtDBus QtDBus4 QtDBusd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) - FIND_LIBRARY(QT_QTCLUCENE_LIBRARY NAMES QtClucene QtClucene4 QtClucened4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) - FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY NAMES QtAssistantClient QtAssistantClient4 QtAssistantClientd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) FIND_LIBRARY(QT_QTHELP_LIBRARY NAMES QtHelp QtHelp4 QtHelpd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) -- cgit v1.2.1 From 3a1e3c2d59fad59a3f79fd25a787e9c709105ed4 Mon Sep 17 00:00:00 2001 From: Till Adam Date: Fri, 15 Feb 2008 16:34:21 +0000 Subject: Avoid a cmake warning by terminating the IF properly. svn path=/trunk/KDE/kdelibs/; revision=775366 --- modules/FindQt4.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index e5798f6b..7f3f03da 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -756,7 +756,7 @@ IF (QT4_QMAKE_FOUND) SET(QT_QTXMLPATTERNS_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtXmlPatterns" CACHE STRING "The QtXmlPatterns library.") ELSE(EXISTS ${QT_LIBRARY_DIR}/QtXmlPatterns.framework) SET(QT_QTXMLPATTERNS_FOUND FALSE) - ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtTest.framework) + ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtXmlPatterns.framework) # WTF? why don't we have frameworks? :P -- cgit v1.2.1 From e87d6853ee74980b2a16cc46f0d39a031a58d658 Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Sun, 17 Feb 2008 17:09:06 +0000 Subject: Bump minimum required version of Qt to 4.4.0. BUG: 157888 Please note that compilation bugs for subversion checkouts do NOT belong bugzilla! Report them to the appropriate mailing list instead. svn path=/trunk/KDE/kdelibs/; revision=776226 --- modules/FindKDE4Internal.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index c4f85cfc..0b0e13b9 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -218,7 +218,7 @@ include (MacroEnsureVersion) cmake_minimum_required(VERSION 2.4.5 FATAL_ERROR) -set(QT_MIN_VERSION "4.3.0") +set(QT_MIN_VERSION "4.4.0") #this line includes FindQt4.cmake, which searches the Qt library and headers find_package(Qt4 REQUIRED) -- cgit v1.2.1 From 814455b7ad321c88e730662fda58261087b72e72 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 18 Feb 2008 19:06:32 +0000 Subject: some improvements to the docs: -some modules were not at all documented, only few are left now -the copyright message doesn't have to be printed for every module in the docs -fix FindKorundom.cmake, it didn't follow the style guide and had typos (e.g. Korumdum_FOUND instead of KORUNDUM_FOUND) Alex (will commit modified FindKDE4Internal.cmake after Christians commit) svn path=/trunk/KDE/kdelibs/; revision=776742 --- modules/CheckPrototypeExists.cmake | 2 +- modules/FindACL.cmake | 2 +- modules/FindAGG.cmake | 2 +- modules/FindAkode.cmake | 2 +- modules/FindAlsa.cmake | 8 ++++---- modules/FindAvahi.cmake | 2 +- modules/FindBerkeleyDB.cmake | 2 +- modules/FindBlitz.cmake | 2 +- modules/FindCarbon.cmake | 5 +++++ modules/FindENCHANT.cmake | 2 +- modules/FindEigen.cmake | 4 ++-- modules/FindFAM.cmake | 2 +- modules/FindFlex.cmake | 1 - modules/FindGMP.cmake | 6 +++--- modules/FindGObject.cmake | 2 +- modules/FindGSSAPI.cmake | 2 +- modules/FindGStreamer.cmake | 2 +- modules/FindKDEWIN.cmake | 2 +- modules/FindKDEWIN32.cmake | 2 +- modules/FindKdeMultimedia.cmake | 9 ++++++++- modules/FindKorundum.cmake | 24 ++++++++++------------- modules/FindLibArt.cmake | 2 +- modules/FindLibintl.cmake | 2 +- modules/FindMsgfmt.cmake | 2 +- modules/FindMusicBrainz.cmake | 7 ++++++- modules/FindMySQL.cmake | 2 +- modules/FindOpenEXR.cmake | 2 +- modules/FindOpenSSL.cmake | 1 + modules/FindPCRE.cmake | 2 +- modules/FindPNG.cmake | 3 +-- modules/FindPackageHandleStandardArgs.cmake | 30 +++++++++++++++-------------- modules/FindPostgreSQL.cmake | 2 +- modules/FindQCA2.cmake | 2 +- modules/FindQImageBlitz.cmake | 2 +- modules/FindRUBY.cmake | 2 +- modules/FindSasl2.cmake | 2 +- modules/FindTIFF.cmake | 2 +- modules/FindTaglib.cmake | 2 +- modules/FindUSB.cmake | 2 +- modules/FindXmms.cmake | 2 +- modules/KDE4Macros.cmake | 8 ++++---- modules/Win32Macros.cmake | 23 ++++++++++++---------- modules/kde4_exec_via_sh.cmake | 2 +- modules/kde4uic.cmake | 1 + 44 files changed, 104 insertions(+), 86 deletions(-) diff --git a/modules/CheckPrototypeExists.cmake b/modules/CheckPrototypeExists.cmake index 8afc6f74..811d6489 100644 --- a/modules/CheckPrototypeExists.cmake +++ b/modules/CheckPrototypeExists.cmake @@ -11,7 +11,7 @@ # CMAKE_REQUIRED_FLAGS = string of compile command line flags # CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar) # CMAKE_REQUIRED_INCLUDES = list of include directories -# + # Copyright (c) 2006, Alexander Neundorf, # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindACL.cmake b/modules/FindACL.cmake index e21e25fa..2c515fdf 100644 --- a/modules/FindACL.cmake +++ b/modules/FindACL.cmake @@ -3,7 +3,7 @@ # # ACL_FOUND - system has the ACL library # ACL_LIBS - The libraries needed to use ACL -# + # Copyright (c) 2006, Pino Toscano, # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindAGG.cmake b/modules/FindAGG.cmake index 57b1d29f..b52814e6 100644 --- a/modules/FindAGG.cmake +++ b/modules/FindAGG.cmake @@ -5,7 +5,7 @@ # AGG_INCLUDE_DIR - the AGG include directory # AGG_LIBRARIES - Link these to use AGG # AGG_DEFINITIONS - Compiler switches required for using AGG -# + # Copyright (c) 2006, Alexander Neundorf, # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindAkode.cmake b/modules/FindAkode.cmake index 72061d37..9e66eb36 100644 --- a/modules/FindAkode.cmake +++ b/modules/FindAkode.cmake @@ -4,7 +4,7 @@ # AKODE_FOUND - system has the aKode library # AKODE_INCLUDE_DIR - the aKode include directory # AKODE_LIBRARIES - The libraries needed to use aKode -# + # Copyright (c) 2006, Pino Toscano, # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindAlsa.cmake b/modules/FindAlsa.cmake index 5b8e43f8..40872ea5 100644 --- a/modules/FindAlsa.cmake +++ b/modules/FindAlsa.cmake @@ -2,10 +2,10 @@ # Only the support for Alsa >= 0.9.x was included; 0.5.x was dropped (but feel free to re-add it if you need it) # It defines ... # It offers the following macros: -# ALSA_CONFIGURE_FILE(config_header) - generate a config.h, typical usage: -# ALSA_CONFIGURE_FILE(${CMAKE_BINARY_DIR}/config-alsa.h) -# ALSA_VERSION_STRING(version_string) looks for alsa/version.h and reads the version string into -# the first argument passed to the macro +# ALSA_CONFIGURE_FILE(config_header) - generate a config.h, typical usage: +# ALSA_CONFIGURE_FILE(${CMAKE_BINARY_DIR}/config-alsa.h) +# ALSA_VERSION_STRING(version_string) looks for alsa/version.h and reads the version string into +# the first argument passed to the macro # Copyright (c) 2006, David Faure, # Copyright (c) 2007, Matthias Kretz diff --git a/modules/FindAvahi.cmake b/modules/FindAvahi.cmake index d328bf19..129e68a6 100644 --- a/modules/FindAvahi.cmake +++ b/modules/FindAvahi.cmake @@ -1,5 +1,5 @@ # Find Avahi. Only avahi-common/defs.h is really needed -# + # Copyright (c) 2007, Jakub Stachowski, # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindBerkeleyDB.cmake b/modules/FindBerkeleyDB.cmake index 18d475bd..749f1664 100644 --- a/modules/FindBerkeleyDB.cmake +++ b/modules/FindBerkeleyDB.cmake @@ -5,7 +5,7 @@ # BERKELEY_DB_INCLUDE_DIR - the Berkeley DB include directory # BERKELEY_DB_LIBRARIES - Link these to use Berkeley DB # BERKELEY_DB_DEFINITIONS - Compiler switches required for using Berkeley DB -# + # Copyright (c) 2006, Alexander Dymo, # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindBlitz.cmake b/modules/FindBlitz.cmake index 6f3e912b..84abc6ad 100644 --- a/modules/FindBlitz.cmake +++ b/modules/FindBlitz.cmake @@ -4,7 +4,7 @@ # BLITZ_FOUND - system has blitz lib # BLITZ_INCLUDES - the blitz include directory # BLITZ_LIBRARIES - The libraries needed to use blitz -# + # Copyright (c) 2006, Montel Laurent, # Copyright (c) 2007, Allen Winter, # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindCarbon.cmake b/modules/FindCarbon.cmake index 38a1aa72..de788f74 100644 --- a/modules/FindCarbon.cmake +++ b/modules/FindCarbon.cmake @@ -1,3 +1,8 @@ +# - Find Carbon on Mac +# +# CARBON_LIBRARY - the library to use Carbon +# CARBON_FOUND - true if Carbon has been found + # Copyright (c) 2006, Benjamin Reed, # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindENCHANT.cmake b/modules/FindENCHANT.cmake index 7b3e4163..76d577c6 100644 --- a/modules/FindENCHANT.cmake +++ b/modules/FindENCHANT.cmake @@ -5,7 +5,7 @@ # ENCHANT_INCLUDE_DIR - the ENCHANT include directory # ENCHANT_LIBRARIES - Link these to use ENCHANT # ENCHANT_DEFINITIONS - Compiler switches required for using ENCHANT -# + # Copyright (c) 2006, Zack Rusin, # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindEigen.cmake b/modules/FindEigen.cmake index 733b2963..1a5fe34f 100644 --- a/modules/FindEigen.cmake +++ b/modules/FindEigen.cmake @@ -3,7 +3,7 @@ # # EIGEN_FOUND - system has eigen lib # EIGEN_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. @@ -21,7 +21,7 @@ find_path(EIGEN_INCLUDE_DIR NAMES eigen/matrix.h ) include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Eigen DEFAULT_MSG EIGEN_INCLUDE_DIR ) +find_package_handle_standard_args(Eigen DEFAULT_MSG EIGEN_INCLUDE_DIR ) mark_as_advanced(EIGEN_INCLUDE_DIR) diff --git a/modules/FindFAM.cmake b/modules/FindFAM.cmake index 62e34e15..8ebb3ab6 100644 --- a/modules/FindFAM.cmake +++ b/modules/FindFAM.cmake @@ -4,7 +4,7 @@ # FAM_FOUND - system has FAM # FAM_INCLUDE_DIR - the FAM include directory # FAM_LIBRARIES - The libraries needed to use FAM -# + # Copyright (c) 2006, Alexander Neundorf, # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindFlex.cmake b/modules/FindFlex.cmake index 631dcd27..01f909c0 100644 --- a/modules/FindFlex.cmake +++ b/modules/FindFlex.cmake @@ -4,7 +4,6 @@ # FLEX_FOUND - system has Flex # FLEX_EXECUTABLE - path of the flex executable # FLEX_VERSION - the version string, like "2.5.31" -# FIND_PROGRAM(FLEX_EXECUTABLE NAMES flex) diff --git a/modules/FindGMP.cmake b/modules/FindGMP.cmake index f9efe90c..67ccbbb1 100644 --- a/modules/FindGMP.cmake +++ b/modules/FindGMP.cmake @@ -1,7 +1,7 @@ # Try to find the GMP librairies -# GMP_FOUND - system has GMP lib -# GMP_INCLUDE_DIR - the GMP include directory -# GMP_LIBRARIES - Libraries needed to use GMP +# GMP_FOUND - system has GMP lib +# GMP_INCLUDE_DIR - the GMP include directory +# GMP_LIBRARIES - Libraries needed to use GMP # Copyright (c) 2006, Laurent Montel, # diff --git a/modules/FindGObject.cmake b/modules/FindGObject.cmake index 4e2a03b7..3d3d6b3d 100644 --- a/modules/FindGObject.cmake +++ b/modules/FindGObject.cmake @@ -5,7 +5,7 @@ # GOBJECT_INCLUDE_DIR - the GObject include directory # GOBJECT_LIBRARIES - the libraries needed to use GObject # GOBJECT_DEFINITIONS - Compiler switches required for using GObject -# + # (c)2006, Tim Beaulen diff --git a/modules/FindGSSAPI.cmake b/modules/FindGSSAPI.cmake index 36dffc85..90e803ea 100644 --- a/modules/FindGSSAPI.cmake +++ b/modules/FindGSSAPI.cmake @@ -5,7 +5,7 @@ # GSSAPI_INCS - the GSSAPI include directory # GSSAPI_LIBS - the libraries needed to use GSSAPI # GSSAPI_FLAVOR - the type of API - MIT or HEIMDAL -# + # Copyright (c) 2006, Pino Toscano, # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindGStreamer.cmake b/modules/FindGStreamer.cmake index 4398f150..f75e92d9 100644 --- a/modules/FindGStreamer.cmake +++ b/modules/FindGStreamer.cmake @@ -5,7 +5,7 @@ # GSTREAMER_INCLUDE_DIR - the GStreamer include directory # GSTREAMER_LIBRARIES - the libraries needed to use GStreamer # GSTREAMER_DEFINITIONS - Compiler switches required for using GStreamer -# + # (c)2006, Tim Beaulen # TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_0_10_FOUND etc) diff --git a/modules/FindKDEWIN.cmake b/modules/FindKDEWIN.cmake index 5694e533..550d11d3 100644 --- a/modules/FindKDEWIN.cmake +++ b/modules/FindKDEWIN.cmake @@ -6,7 +6,7 @@ # this will define # KDEWIN_FOUND - system has KDEWIN # KDEWIN_DIR - the KDEWIN root installation dir -# + # Copyright (c) 2007, Ralf Habacker, # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index aa62f649..589b1531 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -5,7 +5,7 @@ # KDEWIN32_FOUND - system has KDEWIN32 # KDEWIN32_INCLUDES - the KDEWIN32 include directories # KDEWIN32_LIBRARIES - The libraries needed to use KDEWIN32 -# + # Copyright (c) 2006, Alexander Neundorf, # Copyright (c) 2007, Ralf Habacker, # diff --git a/modules/FindKdeMultimedia.cmake b/modules/FindKdeMultimedia.cmake index 457f345d..c8850291 100644 --- a/modules/FindKdeMultimedia.cmake +++ b/modules/FindKdeMultimedia.cmake @@ -1,4 +1,11 @@ -# cmake macro to see if we have kdemultimedia installed +# Module to see if we have KDE4 kdemultimedia installed +# +# This module defines +# KDEMULTIMEDIA_INCLUDE_DIR - the include dir +# KCDDB_LIBRARY - the kcddb library +# KCOMPACTDISC_LIBRARY - the kcompactdisk library +# KDEMULTIMEDIA_LIBRARIES - all of the KDE multimedia libraries together +# KDEMULTIMEDIA_FOUND - true if the above have been found # KDEMULTIMEDIA_INCLUDE_DIR # KDEMULTIMEDIA_FOUND diff --git a/modules/FindKorundum.cmake b/modules/FindKorundum.cmake index 59ad44b1..d921f611 100644 --- a/modules/FindKorundum.cmake +++ b/modules/FindKorundum.cmake @@ -1,24 +1,20 @@ # - Find Korundum - the KDE Ruby bindings # # This module finds if Korundum is installed. -# +# It defines the following variables: +# KORUNDUM_PATH - the path to the korundum ruby file +# KORUNDUM_FOUND - true if it has been found + # Copyright (c) 2006, Egon Willighagen, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -FIND_PATH(Korumdum_PATH Korundum.rb /usr/lib/ruby/1.8) +find_path(KORUNDUM_PATH Korundum.rb /usr/lib/ruby/1.8) -IF (Korumdum_PATH) - SET(Korumdum_FOUND TRUE) -ENDIF (Korumdum_PATH) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Korundum DEFAULT_MSG KORUNDUM_PATH) -IF (Korumdum_FOUND) - IF (NOT Korumdum_FIND_QUIETLY) - MESSAGE(STATUS "Found Korumdum: ${Korumdum_PATH}") - ENDIF (NOT Korumdum_FIND_QUIETLY) -ELSE (Korumdum_FOUND) - IF (Korumdum_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find Korumdum") - ENDIF (Korumdum_FIND_REQUIRED) -ENDIF (Korumdum_FOUND) \ No newline at end of file +# just for compat.: +set(Korumdum_PATH ${KORUNDUM_PATH}) +set(Korumdum_FOUND ${KORUNDUM_FOUND}) diff --git a/modules/FindLibArt.cmake b/modules/FindLibArt.cmake index 86282196..59687877 100644 --- a/modules/FindLibArt.cmake +++ b/modules/FindLibArt.cmake @@ -4,7 +4,7 @@ # LIBART_FOUND - system has the LibArt # LIBART_INCLUDE_DIR - the LibArt include directory # LIBART_LIBRARIES - The libraries needed to use LibArt -# + # Copyright (c) 2006, Alexander Neundorf, # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindLibintl.cmake b/modules/FindLibintl.cmake index e4d0539e..b421ca85 100644 --- a/modules/FindLibintl.cmake +++ b/modules/FindLibintl.cmake @@ -9,7 +9,7 @@ # present in libc. Must have more robust system for release, where Gettext # functionality can also reside in standalone Gettext library, or the one # embedded within kdelibs (cf. gettext.m4 from Gettext source). -# + # Copyright (c) 2006, Chusslove Illich, # Copyright (c) 2007, Alexander Neundorf, # diff --git a/modules/FindMsgfmt.cmake b/modules/FindMsgfmt.cmake index f578b3a2..47c61219 100644 --- a/modules/FindMsgfmt.cmake +++ b/modules/FindMsgfmt.cmake @@ -2,7 +2,7 @@ # Once done this will define # # MSGFMT_FOUND - system has msgfmt -# + # Copyright (c) 2007, Montel Laurent # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindMusicBrainz.cmake b/modules/FindMusicBrainz.cmake index 09884115..9f2ad985 100644 --- a/modules/FindMusicBrainz.cmake +++ b/modules/FindMusicBrainz.cmake @@ -1,5 +1,10 @@ -# Option for build or not MusicBrainz +# Module to find the musicbrainz library # +# It defines +# MUSICBRAINZ_INCLUDE_DIR - the include dir +# MUSICBRAINZ_LIBRARIES - the required libraries +# MUSICBRAINZ_FOUND - true if both of the above have been found + # Copyright (c) 2006,2007 Laurent Montel, # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindMySQL.cmake b/modules/FindMySQL.cmake index daa6d84f..21604c73 100644 --- a/modules/FindMySQL.cmake +++ b/modules/FindMySQL.cmake @@ -6,7 +6,7 @@ # MYSQL_EMBEDDED_LIBRARIES, the libraries needed to use MySQL Embedded. # MYSQL_FOUND, If false, do not try to use MySQL. # MYSQL_EMBEDDED_FOUND, If false, do not try to use MySQL Embedded. -# + # Copyright (c) 2006, Jaroslaw Staniek, # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index 66c57194..cd443c0a 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -5,7 +5,7 @@ # OPENEXR_INCLUDE_DIR - OpenEXR include directory # OPENEXR_LIBRARIES - Libraries needed to use OpenEXR # OPENEXR_DEFINITIONS - definitions required to use OpenEXR -# + # Copyright (c) 2006, Alexander Neundorf, # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindOpenSSL.cmake b/modules/FindOpenSSL.cmake index 2b5313d9..1b915530 100644 --- a/modules/FindOpenSSL.cmake +++ b/modules/FindOpenSSL.cmake @@ -5,6 +5,7 @@ # OPENSSL_INCLUDE_DIR - the OpenSSL include directory # OPENSSL_LIBRARIES - The libraries needed to use OpenSSL # OPENSSL_EAY_LIBRARIES - The additional libraries needed to use OpenSSL on windows + # Copyright (c) 2006, Alexander Neundorf, # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindPCRE.cmake b/modules/FindPCRE.cmake index b39d8875..0eba2e3a 100644 --- a/modules/FindPCRE.cmake +++ b/modules/FindPCRE.cmake @@ -4,7 +4,7 @@ # PCRE_FOUND - system has the PCRE library # PCRE_INCLUDE_DIR - the PCRE include directory # PCRE_LIBRARIES - The libraries needed to use PCRE -# + # Copyright (c) 2006, Alexander Neundorf, # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindPNG.cmake b/modules/FindPNG.cmake index 6939805b..d00c93a0 100644 --- a/modules/FindPNG.cmake +++ b/modules/FindPNG.cmake @@ -1,6 +1,5 @@ # - Find the native PNG includes and library # - # This module defines # PNG_INCLUDE_DIR, where to find png.h, etc. # PNG_LIBRARIES, the libraries to link against to use PNG. @@ -10,7 +9,7 @@ # PNG_LIBRARY, where to find the PNG library. # None of the above will be defined unles zlib can be found. # PNG depends on Zlib -# + # Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. # See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. diff --git a/modules/FindPackageHandleStandardArgs.cmake b/modules/FindPackageHandleStandardArgs.cmake index 151d8125..7f122edc 100644 --- a/modules/FindPackageHandleStandardArgs.cmake +++ b/modules/FindPackageHandleStandardArgs.cmake @@ -1,21 +1,23 @@ # FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME (DEFAULT_MSG|"Custom failure message") VAR1 ... ) -# This macro is intended to be used in FindXXX.cmake modules files. -# It handles the REQUIRED and QUIET argument to FIND_PACKAGE() and -# it also sets the _FOUND variable. -# The package is found if all variables listed are TRUE. -# Example: +# +# This macro is intended to be used in FindXXX.cmake modules files. +# It handles the REQUIRED and QUIET argument to FIND_PACKAGE() and +# it also sets the _FOUND variable. +# The package is found if all variables listed are TRUE. +# Example: # # FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 DEFAULT_MSG LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR) # -# LibXml2 is considered to be found, if both LIBXML2_LIBRARIES and -# LIBXML2_INCLUDE_DIR are valid. Then also LIBXML2_FOUND is set to TRUE. -# If it is not found and REQUIRED was used, it fails with FATAL_ERROR, -# independent whether QUIET was used or not. -# If it is found, the location is reported using the VAR1 argument, so -# here a message "Found LibXml2: /usr/lib/libxml2.so" will be printed out. -# If the second argument is DEFAULT_MSG, the message in the failure case will -# be "Could NOT find LibXml2", if you don't like this message you can specify -# your own custom failure message there. +# LibXml2 is considered to be found, if both LIBXML2_LIBRARIES and +# LIBXML2_INCLUDE_DIR are valid. Then also LIBXML2_FOUND is set to TRUE. +# If it is not found and REQUIRED was used, it fails with FATAL_ERROR, +# independent whether QUIET was used or not. +# +# If it is found, the location is reported using the VAR1 argument, so +# here a message "Found LibXml2: /usr/lib/libxml2.so" will be printed out. +# If the second argument is DEFAULT_MSG, the message in the failure case will +# be "Could NOT find LibXml2", if you don't like this message you can specify +# your own custom failure message there. MACRO(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FAIL_MSG _VAR1 ) diff --git a/modules/FindPostgreSQL.cmake b/modules/FindPostgreSQL.cmake index 43cb1865..ab352c7c 100644 --- a/modules/FindPostgreSQL.cmake +++ b/modules/FindPostgreSQL.cmake @@ -4,7 +4,7 @@ # POSTGRESQL_INCLUDE_DIR, where to find POSTGRESQL.h # POSTGRESQL_LIBRARIES, the libraries needed to use POSTGRESQL. # POSTGRESQL_FOUND, If false, do not try to use PostgreSQL. -# + # Copyright (c) 2006, Jaroslaw Staniek, # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindQCA2.cmake b/modules/FindQCA2.cmake index b0f898f7..950d923c 100644 --- a/modules/FindQCA2.cmake +++ b/modules/FindQCA2.cmake @@ -8,7 +8,7 @@ # # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls -# + # Copyright (c) 2006, Michael Larouche, # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindQImageBlitz.cmake b/modules/FindQImageBlitz.cmake index 24a5d142..6021e5ea 100644 --- a/modules/FindQImageBlitz.cmake +++ b/modules/FindQImageBlitz.cmake @@ -4,7 +4,7 @@ # QIMAGEBLITZ_FOUND - system has qimageblitz lib # QIMAGEBLITZ_INCLUDES - the qimageblitz include directory # QIMAGEBLITZ_LIBRARIES - The libraries needed to use qimageblitz -# + # Copyright (c) 2006, Montel Laurent, # Copyright (c) 2007, Allen Winter, # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindRUBY.cmake b/modules/FindRUBY.cmake index 8696bb49..b5d3c0fd 100644 --- a/modules/FindRUBY.cmake +++ b/modules/FindRUBY.cmake @@ -7,7 +7,7 @@ # RUBY_INCLUDE_PATH = path to where ruby.h can be found # RUBY_EXECUTABLE = full path+file to the ruby binary # RUBY_FOUND = Ruby was found under system. -# + # Copyright (c) 2006,2007 Laurent Montel, # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindSasl2.cmake b/modules/FindSasl2.cmake index f69aea6f..855266fc 100644 --- a/modules/FindSasl2.cmake +++ b/modules/FindSasl2.cmake @@ -4,7 +4,7 @@ # SASL2_FOUND - system has SASL2 # SASL2_INCLUDE_DIR - the SASL2 include directory # SASL2_LIBRARIES - The libraries needed to use SASL2 -# + # Copyright (c) 2006, 2007 Laurent Montel, # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindTIFF.cmake b/modules/FindTIFF.cmake index 49261dd7..24b75b9f 100644 --- a/modules/FindTIFF.cmake +++ b/modules/FindTIFF.cmake @@ -6,7 +6,7 @@ # TIFF_FOUND, If false, do NOT try to use TIFF. # also defined, but NOT for general use are # TIFF_LIBRARY, where to find the TIFF library. -# + # Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. # See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. diff --git a/modules/FindTaglib.cmake b/modules/FindTaglib.cmake index 225fa53d..82306883 100644 --- a/modules/FindTaglib.cmake +++ b/modules/FindTaglib.cmake @@ -4,7 +4,7 @@ # TAGLIB_FOUND - system has the taglib library # TAGLIB_CFLAGS - the taglib cflags # TAGLIB_LIBRARIES - The libraries needed to use taglib -# + # Copyright (c) 2006, Laurent Montel, # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindUSB.cmake b/modules/FindUSB.cmake index 17d893c9..ff18d3b3 100644 --- a/modules/FindUSB.cmake +++ b/modules/FindUSB.cmake @@ -4,7 +4,7 @@ # LIBUSB_FOUND - system has libusb # LIBUSB_INCLUDE_DIR - the libusb include directory # LIBUSB_LIBRARIES - Link these to use libusb -# + # Copyright (c) 2006, Laurent Montel, # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/FindXmms.cmake b/modules/FindXmms.cmake index 7eb2d383..a366cfd0 100644 --- a/modules/FindXmms.cmake +++ b/modules/FindXmms.cmake @@ -4,7 +4,7 @@ # XMMS_FOUND - system has xmms # XMMS_INCLUDE_DIRS - the xmms include directory # XMMS_LDFLAGS - Link these to use xmms -# + # Copyright (c) 2006, 2007 Laurent Montel, # Copyright (c) 2007 Allen Winter # diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index b449b05e..df10d67e 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -1,5 +1,5 @@ # for documentation look at FindKDE4Internal.cmake -# + # this file contains the following macros: # KDE4_ADD_UI_FILES # KDE4_ADD_UI3_FILES @@ -545,15 +545,15 @@ macro (KDE4_HANDLE_RPATH_FOR_EXECUTABLE _target_NAME _type) # set the RPATH related properties if (NOT CMAKE_SKIP_RPATH) if (${_type} STREQUAL "GUI") - set_target_properties(${_target_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE) + set_target_properties(${_target_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE) endif (${_type} STREQUAL "GUI") if (${_type} STREQUAL "NOGUI") - set_target_properties(${_target_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE) + set_target_properties(${_target_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE) endif (${_type} STREQUAL "NOGUI") if (${_type} STREQUAL "RUN_UNINSTALLED") - set_target_properties(${_target_NAME} PROPERTIES SKIP_BUILD_RPATH FALSE BUILD_WITH_INSTALL_RPATH FALSE) + set_target_properties(${_target_NAME} PROPERTIES SKIP_BUILD_RPATH FALSE BUILD_WITH_INSTALL_RPATH FALSE) endif (${_type} STREQUAL "RUN_UNINSTALLED") endif (NOT CMAKE_SKIP_RPATH) diff --git a/modules/Win32Macros.cmake b/modules/Win32Macros.cmake index 3b2df54b..e5a3655b 100644 --- a/modules/Win32Macros.cmake +++ b/modules/Win32Macros.cmake @@ -1,20 +1,23 @@ +# win32 macros # -# win32 macros +# ADDEXPLORERWRAPPER(project) +# +# Exists only under Win32 ! +# +# addExplorerWrapper creates batch files for fast access +# to the build environment from the win32 explorer. # +# For mingw and nmake projects it opens a command shell, +# for Visual Studio IDE's (at least tested with VS 8 2005) it +# opens the related .sln file with paths setting specified at +# configure time. + # Copyright (c) 2006-2007, Ralf Habacker # # Redistribution and use is allowed according to the terms of the BSD license. -# + if (WIN32) - # - # addExplorerWrapper creates batch files for fast access - # to the build environment from the win32 explorer. - # - # For mingw and nmake projects it opens a command shell, - # for Visual Studio IDE's (at least tested with VS 8 2005) it - # opens the related .sln file with paths setting specified at - # configure time. # MACRO (addExplorerWrapper _projectname) # write explorer wrappers diff --git a/modules/kde4_exec_via_sh.cmake b/modules/kde4_exec_via_sh.cmake index 30a837af..6b826ff0 100644 --- a/modules/kde4_exec_via_sh.cmake +++ b/modules/kde4_exec_via_sh.cmake @@ -1,4 +1,4 @@ -# + # Copyright (c) 2006, Alexander Neundorf, # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/modules/kde4uic.cmake b/modules/kde4uic.cmake index 92841663..0e2a33c9 100644 --- a/modules/kde4uic.cmake +++ b/modules/kde4uic.cmake @@ -1,3 +1,4 @@ + # Copyright (c) 2006, Alexander Neundorf, # # Redistribution and use is allowed according to the terms of the BSD license. -- cgit v1.2.1 From f4d7ba644eee24e7a8082f157283b89af4e36fd6 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Mon, 18 Feb 2008 21:16:04 +0000 Subject: LIB_INSTALL_DIR -> INSTALL_TARGETS_DEFAULT_ARGS svn path=/trunk/KDE/kdelibs/; revision=776825 --- modules/FindKDE4Internal.cmake | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 0b0e13b9..1f105819 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -489,14 +489,7 @@ set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) if (WIN32) # use relative install prefix to avoid hardcoded install paths in cmake_install.cmake files -# ok, this is more like a hack to get dll's installed into the same directory as the executables -# without having to use the full syntax of INSTALL(TARGETS ...) everywhere. -# LIB_INSTALL_DIR is set to a list of arguments, the first being the "default" destination -# which is then overridden by the following three specialized destinations - set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" - RUNTIME DESTINATION "bin" - LIBRARY DESTINATION "lib${LIB_SUFFIX}" - ARCHIVE DESTINATION "lib${LIB_SUFFIX}" ) # The subdirectory relative to the install prefix where libraries will be installed (default is ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}) + set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" ) # The subdirectory relative to the install prefix where libraries will be installed (default is ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}) set(EXEC_INSTALL_PREFIX "" ) # Base directory for executables and libraries set(SHARE_INSTALL_PREFIX "share" ) # Base directory for files which go to share/ @@ -602,6 +595,31 @@ else (WIN32) endif (WIN32) +# The INSTALL_TARGETS_DEFAULT_ARGS variable should be used when libraries are installed. +# The arguments are also ok for regular executables, i.e. executables which don't go +# into sbin/ or libexec/, but for installing executables the basic syntax +# INSTALL(TARGETS kate DESTINATION "${BIN_INSTALL_DIR}") +# is enough, so using this variable there doesn't help a lot. +# The variable must not be used for installing plugins. +# Usage is like this: +# install(TARGETS kdecore kdeui ${INSTALL_TARGETS_DEFAULT_ARGS} ) +# +# This will install libraries correctly under UNIX, OSX and Windows (i.e. dll's go +# into bin/. +# Later on it will be possible to extend this for installing OSX frameworks +# The COMPONENT Devel argument has the effect that static libraries belong to the +# "Devel" install component. If we use this also for all install() commands +# for header files, it will be possible to install +# -everything: make install OR cmake -P cmake_install.cmake +# -only the development files: cmake -DCOMPONENT=Devel -P cmake_install.cmake +# -everything except the development files: cmake -DCOMPONENT=Unspecified -P cmake_install.cmake +# This can then also be used for packaging with cpack. + +set(INSTALL_TARGETS_DEFAULT_ARGS RUNTIME DESTINATION "${BIN_INSTALL_DIR}" + LIBRARY DESTINATION "${LIB_INSTALL_DIR}" + ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT Devel ) + + ############## add some more default search paths ############### # always search in the directory where cmake is installed # and in the current installation prefix @@ -1047,3 +1065,4 @@ endif (NOT _kde4_uninstall_rule_created) endif(KDE4_FOUND) + -- cgit v1.2.1 From 723d57b3ef8f31d49684e799d31f62a1d996704c Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 18 Feb 2008 22:31:52 +0000 Subject: fix documentation formatting Alex svn path=/trunk/KDE/kdelibs/; revision=776880 --- modules/FindKDE4Internal.cmake | 215 +++++++++++++++++++++-------------------- 1 file changed, 108 insertions(+), 107 deletions(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 1f105819..246d1bf1 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -2,141 +2,141 @@ # # This module defines the following variables: # -# KDE4_FOUND - set to TRUE if everything required for building KDE software has been found +# KDE4_FOUND - set to TRUE if everything required for building KDE software has been found # -# KDE4_DEFINITIONS - compiler definitions required for compiling KDE software -# KDE4_INCLUDE_DIR - the KDE 4 include directory -# KDE4_INCLUDES - all include directories required for KDE, i.e. -# KDE4_INCLUDE_DIR, but also the Qt4 include directories -# and other platform specific include directories -# KDE4_LIB_DIR - the directory where the KDE libraries are installed, -# intended to be used with LINK_DIRECTORIES() +# KDE4_DEFINITIONS - compiler definitions required for compiling KDE software +# KDE4_INCLUDE_DIR - the KDE 4 include directory +# KDE4_INCLUDES - all include directories required for KDE, i.e. +# KDE4_INCLUDE_DIR, but also the Qt4 include directories +# and other platform specific include directories +# KDE4_LIB_DIR - the directory where the KDE libraries are installed, +# intended to be used with LINK_DIRECTORIES() # # The following variables are defined for the various tools required to # compile KDE software: # -# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler executable -# KDE4_AUTOMOC_EXECUTABLE - the kde4automoc executable -# KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable -# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable +# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler executable +# KDE4_AUTOMOC_EXECUTABLE - the kde4automoc executable +# KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable +# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable # # The following variables point to the location of the KDE libraries, # but shouldn't be used directly: # -# KDE4_KDECORE_LIBRARY - the kdecore library -# KDE4_KDEUI_LIBRARY - the kdeui library -# KDE4_KIO_LIBRARY - the kio library -# KDE4_KPARTS_LIBRARY - the kparts library -# KDE4_KUTILS_LIBRARY - the kutils library -# KDE4_KDE3SUPPORT_LIBRARY - the kde3support library -# KDE4_KFILE_LIBRARY - the kfile library -# KDE4_KHTML_LIBRARY - the khtml library -# KDE4_KJS_LIBRARY - the kjs library -# KDE4_KNEWSTUFF2_LIBRARY - the knewstuff2 library -# KDE4_KDNSSD_LIBRARY - the kdnssd library -# KDE4_PHONON_LIBRARY - the phonon library -# KDE4_KAUDIODEVICELIST_LIBRARY - the kaudiodevicelist library -# KDE4_THREADWEAVER_LIBRARY- the threadweaver library -# KDE4_SOLID_LIBRARY - the solid library -# KDE4_KNOTIFYCONFIG_LIBRARY- the knotifyconfig library -# KDE4_KROSSCORE_LIBRARY - the krosscore library -# KDE4_KTEXTEDITOR_LIBRARY - the ktexteditor library -# KDE4_KNEPOMUK_LIBRARY - the knepomuk library -# KDE4_KMETADATA_LIBRARY - the kmetadata library +# KDE4_KDECORE_LIBRARY - the kdecore library +# KDE4_KDEUI_LIBRARY - the kdeui library +# KDE4_KIO_LIBRARY - the kio library +# KDE4_KPARTS_LIBRARY - the kparts library +# KDE4_KUTILS_LIBRARY - the kutils library +# KDE4_KDE3SUPPORT_LIBRARY - the kde3support library +# KDE4_KFILE_LIBRARY - the kfile library +# KDE4_KHTML_LIBRARY - the khtml library +# KDE4_KJS_LIBRARY - the kjs library +# KDE4_KNEWSTUFF2_LIBRARY - the knewstuff2 library +# KDE4_KDNSSD_LIBRARY - the kdnssd library +# KDE4_PHONON_LIBRARY - the phonon library +# KDE4_KAUDIODEVICELIST_LIBRARY - the kaudiodevicelist library +# KDE4_THREADWEAVER_LIBRARY- the threadweaver library +# KDE4_SOLID_LIBRARY - the solid library +# KDE4_KNOTIFYCONFIG_LIBRARY- the knotifyconfig library +# KDE4_KROSSCORE_LIBRARY - the krosscore library +# KDE4_KTEXTEDITOR_LIBRARY - the ktexteditor library +# KDE4_KNEPOMUK_LIBRARY - the knepomuk library +# KDE4_KMETADATA_LIBRARY - the kmetadata library # # Compared to the variables above, the following variables # also contain all of the depending libraries, so the variables below # should be used instead of the ones above: # -# KDE4_KDECORE_LIBS - the kdecore library and all depending libraries -# KDE4_KDEUI_LIBS - the kdeui library and all depending libraries -# KDE4_KIO_LIBS - the kio library and all depending libraries -# KDE4_KPARTS_LIBS - the kparts library and all depending libraries -# KDE4_KUTILS_LIBS - the kutils library and all depending libraries -# KDE4_KDE3SUPPORT_LIBS - the kde3support library and all depending libraries -# KDE4_KFILE_LIBS - the kfile library and all depending libraries -# KDE4_KHTML_LIBS - the khtml library and all depending libraries -# KDE4_KJS_LIBS - the kjs library and all depending libraries -# KDE4_KNEWSTUFF2_LIBS - the knewstuff2 library and all depending libraries -# KDE4_KDNSSD_LIBS - the kdnssd library and all depending libraries -# KDE4_KDESU_LIBS - the kdesu library and all depending libraries -# KDE4_KPTY_LIBS - the kpty library and all depending libraries -# KDE4_PHONON_LIBS - the phonon library and all depending librairies -# KDE4_THREADWEAVER_LIBRARIES- the threadweaver library and all depending libraries -# KDE4_SOLID_LIBS - the solid library and all depending libraries -# KDE4_KNOTIFYCONFIG_LIBS - the knotify config library and all depending libraries -# KDE4_KROSSCORE_LIBS - the kross core library and all depending libraries -# KDE4_KROSSUI_LIBS - the kross ui library which includes core and all depending libraries -# KDE4_KTEXTEDITOR_LIBS - the ktexteditor library and all depending libraries -# KDE4_KNEPOMUK_LIBS - the knepomuk library and all depending libraries -# KDE4_KMETADATA_LIBS - the kmetadata library and all depending libraries +# KDE4_KDECORE_LIBS - the kdecore library and all depending libraries +# KDE4_KDEUI_LIBS - the kdeui library and all depending libraries +# KDE4_KIO_LIBS - the kio library and all depending libraries +# KDE4_KPARTS_LIBS - the kparts library and all depending libraries +# KDE4_KUTILS_LIBS - the kutils library and all depending libraries +# KDE4_KDE3SUPPORT_LIBS - the kde3support library and all depending libraries +# KDE4_KFILE_LIBS - the kfile library and all depending libraries +# KDE4_KHTML_LIBS - the khtml library and all depending libraries +# KDE4_KJS_LIBS - the kjs library and all depending libraries +# KDE4_KNEWSTUFF2_LIBS - the knewstuff2 library and all depending libraries +# KDE4_KDNSSD_LIBS - the kdnssd library and all depending libraries +# KDE4_KDESU_LIBS - the kdesu library and all depending libraries +# KDE4_KPTY_LIBS - the kpty library and all depending libraries +# KDE4_PHONON_LIBS - the phonon library and all depending librairies +# KDE4_THREADWEAVER_LIBRARIES- the threadweaver library and all depending libraries +# KDE4_SOLID_LIBS - the solid library and all depending libraries +# KDE4_KNOTIFYCONFIG_LIBS - the knotify config library and all depending libraries +# KDE4_KROSSCORE_LIBS - the kross core library and all depending libraries +# KDE4_KROSSUI_LIBS - the kross ui library which includes core and all depending libraries +# KDE4_KTEXTEDITOR_LIBS - the ktexteditor library and all depending libraries +# KDE4_KNEPOMUK_LIBS - the knepomuk library and all depending libraries +# KDE4_KMETADATA_LIBS - the kmetadata library and all depending libraries # -# This module defines a bunch of variables used as locations -# for install directories. They are all interpreted relative -# to CMAKE_INSTALL_PREFIX +# This module defines a bunch of variables used as locations for install directories. +# They can be relative (to CMAKE_INSTALL_PREFIX) or absolute. +# Under Windows they are always relative. # -# BIN_INSTALL_DIR - the directory where executables be installed (default is prefix/bin) -# SBIN_INSTALL_DIR - the directory where system executables will be installed (default is prefix/sbin) -# LIB_INSTALL_DIR - the directory where libraries will be installed (default is prefix/lib) -# CONFIG_INSTALL_DIR - the config file install dir -# DATA_INSTALL_DIR - the parent directory where applications can install their data -# HTML_INSTALL_DIR - the HTML install dir for documentation -# ICON_INSTALL_DIR - the icon install dir (default prefix/share/icons/) -# INFO_INSTALL_DIR - the kde info install dir (default prefix/info) -# KCFG_INSTALL_DIR - the install dir for kconfig files -# LOCALE_INSTALL_DIR - the install dir for translations -# MAN_INSTALL_DIR - the kde man page install dir (default prefix/man/) -# MIME_INSTALL_DIR - the install dir for the mimetype desktop files -# PLUGIN_INSTALL_DIR - the subdirectory relative to the install prefix where plugins will be installed (default is ${KDE4_LIB_INSTALL_DIR}/kde4) -# SERVICES_INSTALL_DIR - the install dir for service (desktop, protocol, ...) files -# SERVICETYPES_INSTALL_DIR - the install dir for servicestypes desktop files -# SOUND_INSTALL_DIR - the install dir for sound files -# TEMPLATES_INSTALL_DIR - the install dir for templates (Create new file...) -# WALLPAPER_INSTALL_DIR - the install dir for wallpapers -# KCONF_UPDATE_INSTALL_DIR - the kconf_update install dir -# XDG_APPS_INSTALL_DIR - the XDG apps dir -# XDG_DIRECTORY_INSTALL_DIR- the XDG directory -# XDG_MIME_INSTALL_DIR - the XDG mimetypes install dir -# DBUS_INTERFACES_INSTALL_DIR - the directory where dbus interfaces be installed (default is prefix/share/dbus-1/interfaces) -# DBUS_SERVICES_INSTALL_DIR - the directory where dbus services be installed (default is prefix/share/dbus-1/services ) +# BIN_INSTALL_DIR - the directory where executables be installed (default is prefix/bin) +# SBIN_INSTALL_DIR - the directory where system executables will be installed (default is prefix/sbin) +# LIB_INSTALL_DIR - the directory where libraries will be installed (default is prefix/lib) +# CONFIG_INSTALL_DIR - the config file install dir +# DATA_INSTALL_DIR - the parent directory where applications can install their data +# HTML_INSTALL_DIR - the HTML install dir for documentation +# ICON_INSTALL_DIR - the icon install dir (default prefix/share/icons/) +# INFO_INSTALL_DIR - the kde info install dir (default prefix/info) +# KCFG_INSTALL_DIR - the install dir for kconfig files +# LOCALE_INSTALL_DIR - the install dir for translations +# MAN_INSTALL_DIR - the kde man page install dir (default prefix/man/) +# MIME_INSTALL_DIR - the install dir for the mimetype desktop files +# PLUGIN_INSTALL_DIR - the subdirectory relative to the install prefix where plugins will be installed (default is ${KDE4_LIB_INSTALL_DIR}/kde4) +# SERVICES_INSTALL_DIR - the install dir for service (desktop, protocol, ...) files +# SERVICETYPES_INSTALL_DIR - the install dir for servicestypes desktop files +# SOUND_INSTALL_DIR - the install dir for sound files +# TEMPLATES_INSTALL_DIR - the install dir for templates (Create new file...) +# WALLPAPER_INSTALL_DIR - the install dir for wallpapers +# KCONF_UPDATE_INSTALL_DIR - the kconf_update install dir +# XDG_APPS_INSTALL_DIR - the XDG apps dir +# XDG_DIRECTORY_INSTALL_DIR- the XDG directory +# XDG_MIME_INSTALL_DIR - the XDG mimetypes install dir +# DBUS_INTERFACES_INSTALL_DIR - the directory where dbus interfaces be installed (default is prefix/share/dbus-1/interfaces) +# DBUS_SERVICES_INSTALL_DIR - the directory where dbus services be installed (default is prefix/share/dbus-1/services ) # # The following variable is provided, but seem to be unused: -# LIBS_HTML_INSTALL_DIR /share/doc/HTML CACHE STRING "Is this still used ?") +# LIBS_HTML_INSTALL_DIR /share/doc/HTML CACHE STRING "Is this still used ?") # # The following user adjustable options are provided: # -# KDE4_ENABLE_FINAL - enable KDE-style enable-final all-in-one-compilation -# KDE4_BUILD_TESTS - enable this to build the testcases -# KDE4_ENABLE_FPIE - enable it to use gcc Position Independent Executables feature +# KDE4_ENABLE_FINAL - enable KDE-style enable-final all-in-one-compilation +# KDE4_BUILD_TESTS - enable this to build the testcases +# KDE4_ENABLE_FPIE - enable it to use gcc Position Independent Executables feature # # It also adds the following macros (from KDE4Macros.cmake) -# KDE4_ADD_UI_FILES (SRCS_VAR file1.ui ... fileN.ui) +# KDE4_ADD_UI_FILES (SRCS_VAR file1.ui ... fileN.ui) # Use this to add Qt designer ui files to your application/library. # -# KDE4_ADD_UI3_FILES (SRCS_VAR file1.ui ... fileN.ui) +# KDE4_ADD_UI3_FILES (SRCS_VAR file1.ui ... fileN.ui) # Use this to add Qt designer ui files from Qt version 3 to your application/library. # -# KDE4_ADD_KCFG_FILES (SRCS_VAR [GENERATE_MOC] file1.kcfgc ... fileN.kcfgc) +# KDE4_ADD_KCFG_FILES (SRCS_VAR [GENERATE_MOC] file1.kcfgc ... fileN.kcfgc) # Use this to add KDE config compiler files to your application/library. # Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files. # -# KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets) +# KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets) # Use this to add widget description files for the makekdewidgets code generator # for Qt Designer plugins. # -# KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN) +# KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN) # This macro is intended mainly for internal uses. # It is used for enable-final. It will generate two source files, # one for the C files and one for the C++ files. # These files will have the names given in filename_CXX and filename_C. # -# KDE4_ADD_PLUGIN ( name [WITH_PREFIX] file1 ... fileN ) +# KDE4_ADD_PLUGIN ( name [WITH_PREFIX] file1 ... fileN ) # Create a KDE plugin (KPart, kioslave, etc.) from the given source files. # It supports KDE4_ENABLE_FINAL. # If WITH_PREFIX is given, the resulting plugin will have the prefix "lib", otherwise it won't. # It creates and installs an appropriate libtool la-file. # -# KDE4_ADD_KDEINIT_EXECUTABLE (name [NOGUI] [RUN_UNINSTALLED] file1 ... fileN) +# KDE4_ADD_KDEINIT_EXECUTABLE (name [NOGUI] [RUN_UNINSTALLED] file1 ... fileN) # Create a KDE application in the form of a module loadable via kdeinit. # A library named kdeinit_ will be created and a small executable which links to it. # It supports KDE4_ENABLE_FINAL @@ -146,7 +146,7 @@ # application bundles are created, with the NOGUI option no bundles but simple executables # are created. Currently it doesn't have any effect on other platforms. # -# KDE4_ADD_EXECUTABLE (name [NOGUI] [RUN_UNINSTALLED] file1 ... fileN) +# KDE4_ADD_EXECUTABLE (name [NOGUI] [RUN_UNINSTALLED] file1 ... fileN) # Equivalent to ADD_EXECUTABLE(), but additionally adds some more features: # -support for KDE4_ENABLE_FINAL # -support for automoc @@ -157,11 +157,11 @@ # application bundles are created, with the NOGUI option no bundles but simple executables # are created. Currently it doesn't have any effect on other platforms. # -# KDE4_ADD_LIBRARY (name [STATIC | SHARED | MODULE ] file1 ... fileN) +# KDE4_ADD_LIBRARY (name [STATIC | SHARED | MODULE ] file1 ... fileN) # Equivalent to ADD_LIBRARY(), but additionally it supports KDE4_ENABLE_FINAL # and under Windows it adds a -DMAKE__LIB definition to the compilation. # -# KDE4_ADD_UNIT_TEST (testname [TESTNAME targetname] file1 ... fileN) +# KDE4_ADD_UNIT_TEST (testname [TESTNAME targetname] file1 ... fileN) # add a unit test, which is executed when running make test # it will be built with RPATH poiting to the build dir # The targets are always created, but only built for the "all" @@ -170,7 +170,7 @@ # The name of the target can be specified using TESTNAME , if it is not given # the macro will default to the # -# KDE4_ADD_TEST_EXECUTABLE (name file1 ... fileN) +# KDE4_ADD_TEST_EXECUTABLE (name file1 ... fileN) # add an test executable # it will be built with RPATH poiting to the build dir # The targets are always created, but only built for the "all" @@ -180,36 +180,38 @@ # KGlobal::dirs()->addResourceDir( "data", KDESRCDIR ); to be able to use xmlgui # and other things in the test, that normally require installation # -# KDE4_UPDATE_ICONCACHE() +# KDE4_UPDATE_ICONCACHE() # Notifies the icon cache that new icons have been installed by updating # mtime of ${ICON_INSTALL_DIR}/hicolor directory. # -# KDE4_INSTALL_ICONS( path theme) +# KDE4_INSTALL_ICONS( path theme) # Installs all png and svgz files in the current directory to the icon # directoy given in path, in the subdirectory for the given icon theme. # -# KDE4_CREATE_HANDBOOK( docbookfile [INSTALL_DESTINATION installdest] [SUBDIR subdir]) +# KDE4_CREATE_HANDBOOK( docbookfile [INSTALL_DESTINATION installdest] [SUBDIR subdir]) # Create the handbook from the docbookfile (using meinproc4) # The resulting handbook will be installed to when using # INSTALL_DESTINATION , or to / if # SUBDIR is specified. # -# KDE4_CREATE_MANPAGE( docbookfile section ) +# KDE4_CREATE_MANPAGE( docbookfile section ) # Create the manpage for the specified section from the docbookfile (using meinproc4) # The resulting manpage will be installed to when using # INSTALL_DESTINATION , or to / if # SUBDIR is specified. -# -# _KDE4_PLATFORM_INCLUDE_DIRS is used only internally -# _KDE4_PLATFORM_DEFINITIONS is used only internally -# -# -# Copyright (c) 2006, Alexander Neundorf + + +# _KDE4_PLATFORM_INCLUDE_DIRS is used only internally +# _KDE4_PLATFORM_DEFINITIONS is used only internally + +# Copyright (c) 2006-2008, Alexander Neundorf # Copyright (c) 2006, Laurent Montel, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + if(KDE4_FOUND) # Already found in this cmake run, nothing more to do else(KDE4_FOUND) @@ -1065,4 +1067,3 @@ endif (NOT _kde4_uninstall_rule_created) endif(KDE4_FOUND) - -- cgit v1.2.1 From 648f2aee9796d2e2b5827fb5346c65e581504632 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 19 Feb 2008 08:35:49 +0000 Subject: Try to search XINE_XCB_FOUND if we have xine installed svn path=/trunk/KDE/kdelibs/; revision=776982 --- modules/FindXine.cmake | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/FindXine.cmake b/modules/FindXine.cmake index 65777ed8..534613a6 100644 --- a/modules/FindXine.cmake +++ b/modules/FindXine.cmake @@ -47,10 +47,13 @@ if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE) endif (XINE_VERSION_OK) endif (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE) -INCLUDE(CheckCSourceCompiles) -SET(CMAKE_REQUIRED_INCLUDES ${XINE_INCLUDE_DIR}) -SET(CMAKE_REQUIRED_LIBRARIES ${XINE_LIBRARY}) -CHECK_C_SOURCE_COMPILES("#include \nint main()\n{\n xine_open_video_driver(xine_new(), \"auto\", XINE_VISUAL_TYPE_XCB, NULL);\n return 0;\n}\n" XINE_XCB_FOUND) + +if( XINE_FOUND ) + INCLUDE(CheckCSourceCompiles) + SET(CMAKE_REQUIRED_INCLUDES ${XINE_INCLUDE_DIR}) + SET(CMAKE_REQUIRED_LIBRARIES ${XINE_LIBRARY}) + CHECK_C_SOURCE_COMPILES("#include \nint main()\n{\n xine_open_video_driver(xine_new(), \"auto\", XINE_VISUAL_TYPE_XCB, NULL);\n return 0;\n}\n" XINE_XCB_FOUND) +endif(XINE_FOUND) if (XINE_FOUND) if (NOT Xine_FIND_QUIETLY) -- cgit v1.2.1 From 493aa49d3e73cf0a191f5e13afd822dfbfe8fd79 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Wed, 20 Feb 2008 00:00:32 +0000 Subject: cmake 2.6 is stricter, it checks whether there are targets with multiple names. This breaks buildtests target, since this is created multiple times. Disable the check in cmake so it works again. Alex svn path=/trunk/KDE/kdelibs/; revision=777214 --- modules/FindKDE4Internal.cmake | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 246d1bf1..dcde0cf0 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -306,10 +306,9 @@ else (_kdeBootStrapping) # Check the version of kde. KDE4_KDECONFIG_EXECUTABLE was set by FindKDE4 exec_program(${KDE4_KDECONFIG_EXECUTABLE} ARGS "--version" OUTPUT_VARIABLE kdeconfig_output ) - string(REGEX MATCH "KDE: [0-9]+\\.[0-9]+\\.[0-9]+" KDEVERSION "${kdeconfig_output}") - if (KDEVERSION) + if (KDEVERSION) string(REGEX REPLACE "^KDE: " "" KDEVERSION "${KDEVERSION}") # we need at least this version: @@ -319,7 +318,6 @@ else (_kdeBootStrapping) #message(STATUS "KDE_MIN_VERSION=${KDE_MIN_VERSION} found ${KDEVERSION}") macro_ensure_version( ${KDE_MIN_VERSION} ${KDEVERSION} KDE4_INSTALLED_VERSION_OK ) - else (KDEVERSION) message(FATAL_ERROR "Couldn't parse KDE version string from the kde4-config output:\n${kdeconfig_output}") endif (KDEVERSION) @@ -657,6 +655,16 @@ if(WIN32) endif(WIN32) +# CMake 2.6 gives errors if there are multiple targets with the same name +# we use this for the target "buildtests", which is created for the unit tests +# and which depends on the tests, so building "buildtests" builds all the tests +# enabling this property disables this check in CMake +if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.4) + set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1) +endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.4) + + + ##################### and now the platform specific stuff ############################ # Set a default build type for single-configuration -- cgit v1.2.1 From c0c75cf957d5e7aef30c9c59c27a6ccc760d60c5 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Wed, 20 Feb 2008 21:38:34 +0000 Subject: -give a useful error message if somebody is using an old cmake cvs, which doesn't have set_property() yet Alex svn path=/trunk/KDE/kdelibs/; revision=777542 --- modules/FindKDE4Internal.cmake | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index dcde0cf0..fb1b3f1d 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -655,11 +655,15 @@ if(WIN32) endif(WIN32) -# CMake 2.6 gives errors if there are multiple targets with the same name -# we use this for the target "buildtests", which is created for the unit tests -# and which depends on the tests, so building "buildtests" builds all the tests -# enabling this property disables this check in CMake if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.4) + if(NOT COMMAND SET_PROPERTY) + message(FATAL_ERROR "You are using an old version of CMake from cvs, please update to CMake >= 2.6.0 or cvs at least from Feb 20th, 2008") + endif(NOT COMMAND SET_PROPERTY) + + # CMake 2.6 gives errors if there are multiple targets with the same name + # we use this for the target "buildtests", which is created for the unit tests + # and which depends on the tests, so building "buildtests" builds all the tests + # enabling this property disables this check in CMake set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1) endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.4) -- cgit v1.2.1 From bd68ca4f895d27a2300e82d8f5301a4babfe397b Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Wed, 20 Feb 2008 22:32:03 +0000 Subject: -don't put LINK_DIRECTORIES() into the installed KDELibsDependencies.cmake file, instead enable the compatibility option CMAKE_LINK_OLD_PATHS, which should catch all problems (and not only the expected ones) -give an error message if an old cmake cvs without SET_PROPERTY() is used -remove check for installed dbusxml2cpp, this was still from the KDE4 core meeting in Trysil when dbus was very new in Qt Alex svn path=/trunk/KDE/kdelibs/; revision=777570 --- modules/FindKDE4Internal.cmake | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index fb1b3f1d..fc9008f1 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -224,10 +224,6 @@ set(QT_MIN_VERSION "4.4.0") #this line includes FindQt4.cmake, which searches the Qt library and headers find_package(Qt4 REQUIRED) -if (NOT QT_DBUSXML2CPP_EXECUTABLE) - message(FATAL_ERROR "Qt4 qdbusxml2cpp was not found. Make sure it has been built and installed by Qt") -endif (NOT QT_DBUSXML2CPP_EXECUTABLE) - # Perl is required for building KDE software, find_package(Perl REQUIRED) @@ -656,15 +652,40 @@ endif(WIN32) if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.4) + + # some developers may be using an cmake cvs version which didn't have set_property() yet + # Tell them that a more recent version is required. if(NOT COMMAND SET_PROPERTY) - message(FATAL_ERROR "You are using an old version of CMake from cvs, please update to CMake >= 2.6.0 or cvs at least from Feb 20th, 2008") + message(FATAL_ERROR "You are using an old version of CMake from cvs, please update to CMake >= 2.6.0 or cvs at least from Feb 20th, 2008") endif(NOT COMMAND SET_PROPERTY) # CMake 2.6 gives errors if there are multiple targets with the same name # we use this for the target "buildtests", which is created for the unit tests # and which depends on the tests, so building "buildtests" builds all the tests # enabling this property disables this check in CMake - set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1) + set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS TRUE) + + # CMake 2.6 uses the full file names of the libraries when linking and so + # doesn't use -L anymore to list the link dirs. Now the dependencies created + # export_library_dependencies() lists the in-project libraries without + # path, i.e. with only the logical name ("kdecore"), so they don't link + # Setting this variable to true has the effect that the link dirs are + # listed nevertheless also with CMake 2.6. + set(CMAKE_LINK_OLD_PATHS TRUE) + + + # the following link_directories() command could be inserted in the KDELibsDependencies.cmake + # file. This should basically also fix the linking problem for libs with just the + # symbolic name (coming from export_library_dependencies()). But this will need + # adapting also the other places where export_library_dependencies() is used. + # I guess just enabling the compatibility option above is more safe. + # Once we require CMake >= 2.6.0 this will be reworked. Alex + # + # # in CMake 2.6 the handling of the link directories has changed, so we need this here + # if(\"\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}\" GREATER 2.4) + # link_directories( \"\${KDE4_LIB_INSTALL_DIR}\" ) + # endif(\"\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}\" GREATER 2.4) + endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.4) -- cgit v1.2.1 From 210b3e2da759777de04d63b2607010ab46229934 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Sun, 24 Feb 2008 17:11:08 +0000 Subject: give each handbook and manpage custom target a unique, recognizable name. svn path=/trunk/KDE/kdelibs/; revision=778813 --- modules/KDE4Macros.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index df10d67e..68cae0d2 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -270,7 +270,9 @@ macro (KDE4_CREATE_HANDBOOK _docbook) DEPENDS ${_docs} ${_KDE4_MEINPROC_EXECUTABLE_DEP} ${_ssheet} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) - add_custom_target(handbook ALL DEPENDS ${_doc}) + get_filename_component(_targ ${CMAKE_CURRENT_SOURCE_DIR} NAME) + set(_targ "${_targ}-handbook") + add_custom_target(${_targ} ALL DEPENDS ${_doc}) if(KDE4_ENABLE_HTMLHANDBOOK) set(_htmlDoc ${CMAKE_CURRENT_SOURCE_DIR}/index.html) @@ -336,7 +338,9 @@ macro (KDE4_CREATE_MANPAGE _docbook _section) COMMAND ${KDE4_MEINPROC_EXECUTABLE} --stylesheet ${_ssheet} --check ${_bootstrapOption} ${_input} DEPENDS ${_input} ${_KDE4_MEINPROC_EXECUTABLE_DEP} ${_ssheet} ) - add_custom_target(manpage ALL DEPENDS "${_outdoc}") + get_filename_component(_targ ${CMAKE_CURRENT_SOURCE_DIR} NAME) + set(_targ "${_targ}-manpage") + add_custom_target(${_targ} ALL DEPENDS "${_outdoc}") set(_args ${ARGN}) -- cgit v1.2.1