From a2e2200564df58788d3106f9ffb59fd157820919 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Fri, 4 Jan 2008 16:48:07 +0000 Subject: add a new variable FREETYPE_INCLUDE_DIRS which should be used instead of FREETYPE_INCLUDE_DIR, since there were no objections left on k-c-d http://lists.kde.org/?t=119944157800001&r=1&w=2 Alex will this actually be in 4.0.0 or 4.0.1 ? There are still a lot of commits in the branch going on. svn path=/branches/KDE/4.0/kdelibs/; revision=757285 --- modules/FindFreetype.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/FindFreetype.cmake b/modules/FindFreetype.cmake index d2821931..66198b9e 100644 --- a/modules/FindFreetype.cmake +++ b/modules/FindFreetype.cmake @@ -2,9 +2,10 @@ # Once done this will define # # FREETYPE_FOUND - system has Freetype -# FREETYPE_INCLUDE_DIR - the FREETYPE include directory +# FREETYPE_INCLUDE_DIRS - the FREETYPE include directories # FREETYPE_LIBRARIES - Link these to use FREETYPE -# +# FREETYPE_INCLUDE_DIR is internal and deprecated for use + # Copyright (c) 2006, Laurent Montel, # # Redistribution and use is allowed according to the terms of the BSD license. @@ -69,3 +70,5 @@ else (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) ENDIF (FREETYPE_FOUND) endif (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) + +set(FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR}) -- cgit v1.2.1 From 8a7b4a66fe530d8507a1bb91fdf8705d33d662bb Mon Sep 17 00:00:00 2001 From: Marijn Kruisselbrink Date: Sat, 12 Jan 2008 11:39:43 +0000 Subject: backport 759619: 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=/branches/KDE/4.0/kdelibs/; revision=760256 --- modules/KDE4Macros.cmake | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 4f4e0a9f..435fc15a 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 91d93811994077671eb7470e3c4f9610f7e42813 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Sat, 12 Jan 2008 16:39:20 +0000 Subject: backport SVN commit 760423 by winterz: - 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=/branches/KDE/4.0/kdelibs/; revision=760429 --- 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 415b2562488a1bf8afb4e1036df393afc4cee352 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Sun, 13 Jan 2008 17:22:53 +0000 Subject: backport FULL_RPATH osx fix to 4.0 svn path=/branches/KDE/4.0/kdelibs/; revision=760907 --- modules/FindKDE4Internal.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index c7701e7c..bab5fb96 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 45ef8e26553404c2df522a9d0a3801097c9f6497 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Thu, 17 Jan 2008 16:22:17 +0000 Subject: Raise the "warning level" to shared-mime-info 0.20. svn path=/branches/KDE/4.0/kdelibs/; revision=762656 --- modules/FindSharedMimeInfo.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FindSharedMimeInfo.cmake b/modules/FindSharedMimeInfo.cmake index 154e58a5..f3ca64cc 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) -- cgit v1.2.1 From 1d22b2b487ca089f3b6d54eafc6182d120ecd757 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Tue, 22 Jan 2008 16:50:56 +0000 Subject: backport SVN commit 764809 by winterz: 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=/branches/KDE/4.0/kdelibs/; revision=764816 --- modules/KDE4Macros.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 435fc15a..4a975088 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