From 066e0ef8910b4e2a39ee15b3bf313b7218608acc Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 28 Jun 2009 08:24:47 +0000 Subject: -same fix as in trunk: the name of the variable is _firstConfig, not firstConfig, thanks to Aleix Alex svn path=/branches/KDE/4.3/kdelibs/; revision=988525 --- modules/FindKDE4Internal.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index e06789c5..6ba7c9f6 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -513,9 +513,9 @@ else (_kdeBootStrapping) get_target_property(_importedConfigurations ${KDE4_TARGET_PREFIX}kconfig_compiler IMPORTED_CONFIGURATIONS ) list(GET _importedConfigurations 0 _firstConfig) - get_target_property(KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler LOCATION_${firstConfig}) - get_target_property(KDE4_MEINPROC_EXECUTABLE ${KDE4_TARGET_PREFIX}meinproc4 LOCATION_${firstConfig}) - get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets LOCATION_${firstConfig}) + get_target_property(KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler LOCATION_${_firstConfig}) + get_target_property(KDE4_MEINPROC_EXECUTABLE ${KDE4_TARGET_PREFIX}meinproc4 LOCATION_${_firstConfig}) + get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets LOCATION_${_firstConfig}) # allow searching cmake modules in all given kde install locations (KDEDIRS based) execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) -- cgit v1.2.1 From f041399481891baf346a91cc9965ca5c605a9924 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sun, 5 Jul 2009 21:31:30 +0000 Subject: Backport r991884: Show a fatal error if anyone tries to use FindKdepim. svn path=/branches/KDE/4.3/kdelibs/; revision=991886 --- FindKdepim.cmake | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 FindKdepim.cmake diff --git a/FindKdepim.cmake b/FindKdepim.cmake new file mode 100644 index 00000000..5757b0ab --- /dev/null +++ b/FindKdepim.cmake @@ -0,0 +1,3 @@ +# Nothing should require kdepim. We'll show a fatal error and an explanation. +message(FATAL_ERROR "You must not use the FindKdepim CMake module. If you need more informations about this error, please contact us on the kde-pim mailing list.") + -- cgit v1.2.1 From 8c8c2aed4dc51306106a4bbc7e14a8cd5e72acaa Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sun, 5 Jul 2009 21:52:45 +0000 Subject: Move FindKdepim in the correct directory. svn path=/branches/KDE/4.3/kdelibs/; revision=991888 --- FindKdepim.cmake | 3 --- modules/FindKdepim.cmake | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 FindKdepim.cmake create mode 100644 modules/FindKdepim.cmake diff --git a/FindKdepim.cmake b/FindKdepim.cmake deleted file mode 100644 index 5757b0ab..00000000 --- a/FindKdepim.cmake +++ /dev/null @@ -1,3 +0,0 @@ -# Nothing should require kdepim. We'll show a fatal error and an explanation. -message(FATAL_ERROR "You must not use the FindKdepim CMake module. If you need more informations about this error, please contact us on the kde-pim mailing list.") - diff --git a/modules/FindKdepim.cmake b/modules/FindKdepim.cmake new file mode 100644 index 00000000..5757b0ab --- /dev/null +++ b/modules/FindKdepim.cmake @@ -0,0 +1,3 @@ +# Nothing should require kdepim. We'll show a fatal error and an explanation. +message(FATAL_ERROR "You must not use the FindKdepim CMake module. If you need more informations about this error, please contact us on the kde-pim mailing list.") + -- cgit v1.2.1 From 76f5a21cccb8f7ca92179d59508f2045176361d1 Mon Sep 17 00:00:00 2001 From: David Faure Date: Sun, 12 Jul 2009 22:36:18 +0000 Subject: Always define MAKE_FOO_LIB, not only on Windows. This is used in konqueror to know when to enable KDE_TESTS_EXPORT. What I don't understand, is why it worked before; konqprivate_export.h always relied on MAKE_KDEINIT_KONQUEROR_LIB... (and without this commit, konqviewmgrtest failed with undefined symbol KonqSettings::self(), which is logical) CCMAIL: kde-buildsystem@kde.org svn path=/branches/KDE/4.3/kdelibs/; revision=995533 --- modules/KDE4Macros.cmake | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 17a8065e..cf33ad35 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -574,13 +574,11 @@ macro (KDE4_ADD_PLUGIN _target_NAME _with_PREFIX) set_target_properties(${_target_NAME} PROPERTIES PREFIX "") endif (_first_SRC) - if (WIN32) - # for shared libraries/plugins a -DMAKE_target_LIB is required - string(TOUPPER ${_target_NAME} _symbol) - string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _symbol ${_symbol}) - set(_symbol "MAKE_${_symbol}_LIB") - set_target_properties(${_target_NAME} PROPERTIES DEFINE_SYMBOL ${_symbol}) - endif (WIN32) + # for shared libraries/plugins a -DMAKE_target_LIB is required + string(TOUPPER ${_target_NAME} _symbol) + string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _symbol ${_symbol}) + set(_symbol "MAKE_${_symbol}_LIB") + set_target_properties(${_target_NAME} PROPERTIES DEFINE_SYMBOL ${_symbol}) endmacro (KDE4_ADD_PLUGIN _target_NAME _with_PREFIX) -- cgit v1.2.1 From 578326f7251a85d9368cfaa462b91f7b7f3dd81f Mon Sep 17 00:00:00 2001 From: Sebastian Trueg Date: Wed, 29 Jul 2009 18:13:18 +0000 Subject: Make sure the Soprano cmake macros are found. svn path=/branches/KDE/4.3/kdelibs/; revision=1004260 --- modules/FindSoprano.cmake | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/FindSoprano.cmake b/modules/FindSoprano.cmake index fb84c2e4..65c22561 100644 --- a/modules/FindSoprano.cmake +++ b/modules/FindSoprano.cmake @@ -173,6 +173,17 @@ set(SOPRANO_PLUGIN_VIRTUOSOBACKEND_FOUND TRUE) set(_plugins "${_plugins} virtuosobackend") endif(EXISTS ${SOPRANO_PLUGIN_DIR}/virtuosobackend.desktop) + + # make sure the Soprano cmake macros are found + get_filename_component(_SOPRANO_PREFIX ${SOPRANO_INCLUDE_DIR} PATH) + find_file(_SOPRANO_MACRO_FILE NAMES SopranoAddOntology.cmake HINTS ${_SOPRANO_PREFIX}/share/soprano/cmake ) + if(_SOPRANO_MACRO_FILE) + # new Soprano > 2.3.0 location + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${_SOPRANO_PREFIX}/share/soprano/cmake) + else(_SOPRANO_MACRO_FILE) + # the old Soprano 2.3.0 location + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${_SOPRANO_PREFIX}/share/apps/cmake/modules) + endif(_SOPRANO_MACRO_FILE) endif(Soprano_FOUND) -- cgit v1.2.1 From a618415d7c449aab3887dacf7833330602d49e37 Mon Sep 17 00:00:00 2001 From: Mike Arthur Date: Sun, 2 Aug 2009 12:46:37 +0000 Subject: Fix OSX compilation with Nokia Qt SDK. svn path=/branches/KDE/4.3/kdelibs/; revision=1005875 --- modules/FindQt4.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 52359172..70676762 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -727,6 +727,7 @@ IF (QT4_QMAKE_FOUND) PATHS ${QT_INCLUDE_DIR}/QtWebKit ${QT_HEADERS_DIR}/QtWebKit + ${QT_LIBRARY_DIR}/QtWebkit.framework/Headers NO_DEFAULT_PATH ) -- cgit v1.2.1 From 395de9a3cd4ca8691792d9de6c2f9ec397f6ebea Mon Sep 17 00:00:00 2001 From: Carlo Segato Date: Sun, 9 Aug 2009 22:22:33 +0000 Subject: backport r1009407 don't use visibility on windows with gcc 4.4 svn path=/branches/KDE/4.3/kdelibs/; revision=1009408 --- modules/FindKDE4Internal.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 6ba7c9f6..03f8f6d6 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -1079,7 +1079,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) string(REGEX MATCH "(--enable-libstdcxx-allocator=mt)" _GCC_COMPILED_WITH_BAD_ALLOCATOR "${_gcc_alloc_info}") endif (GCC_IS_NEWER_THAN_4_1) - if (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR) + if (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR AND NOT WIN32) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") set (KDE4_C_FLAGS "-fvisibility=hidden") # check that Qt defines Q_DECL_EXPORT as __attribute__ ((visibility("default"))) @@ -1101,9 +1101,9 @@ if (CMAKE_COMPILER_IS_GNUCXX) if (GCC_IS_NEWER_THAN_4_2) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") endif (GCC_IS_NEWER_THAN_4_2) - else (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR) + else (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR AND NOT WIN32) set (__KDE_HAVE_GCC_VISIBILITY 0) - endif (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR) + endif (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR AND NOT WIN32) endif (CMAKE_COMPILER_IS_GNUCXX) -- cgit v1.2.1 From 62fc404ae8e6d5dc0e7fb676df07d0aa4174f6f2 Mon Sep 17 00:00:00 2001 From: Carlo Segato Date: Sun, 9 Aug 2009 22:32:58 +0000 Subject: backport r1009414 add CMAKE_C_COMPILER_ARG1 as argument when executing the compiler, this way cmake doesn't fail if we set CC to something like 'distcc /path/to/gcc' svn path=/branches/KDE/4.3/kdelibs/; revision=1009415 --- modules/FindKDE4Internal.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 03f8f6d6..e3478339 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -1054,7 +1054,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) set( __KDE_HAVE_GCC_VISIBILITY ${__KDE_HAVE_GCC_VISIBILITY} CACHE BOOL "GCC support for hidden visibility") # get the gcc version - exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info) + exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info) string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here: @@ -1075,7 +1075,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) set(_GCC_COMPILED_WITH_BAD_ALLOCATOR FALSE) if (GCC_IS_NEWER_THAN_4_1) - exec_program(${CMAKE_C_COMPILER} ARGS -v OUTPUT_VARIABLE _gcc_alloc_info) + exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} -v OUTPUT_VARIABLE _gcc_alloc_info) string(REGEX MATCH "(--enable-libstdcxx-allocator=mt)" _GCC_COMPILED_WITH_BAD_ALLOCATOR "${_gcc_alloc_info}") endif (GCC_IS_NEWER_THAN_4_1) -- cgit v1.2.1 From 7c2c90c7fd2df31b30c022360da476711d91371a Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 11 Aug 2009 08:35:20 +0000 Subject: Use HINTS not PATHS to suggest paths to be searched svn path=/branches/KDE/4.3/kdelibs/; revision=1009919 --- modules/FindQImageBlitz.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/FindQImageBlitz.cmake b/modules/FindQImageBlitz.cmake index 232d7c40..1b34741e 100644 --- a/modules/FindQImageBlitz.cmake +++ b/modules/FindQImageBlitz.cmake @@ -27,10 +27,9 @@ find_path(QIMAGEBLITZ_INCLUDES NAMES qimageblitz.h PATH_SUFFIXES qimageblitz - PATHS + HINTS $ENV{QIMAGEBLITZDIR}/include ${PC_QIMAGEBLITZ_INCLUDEDIR} - ${PC_QIMAGEBLITZ_INCLUDE_DIRS} ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ) @@ -38,10 +37,9 @@ find_path(QIMAGEBLITZ_INCLUDES find_library_with_debug(QIMAGEBLITZ_LIBRARIES WIN32_DEBUG_POSTFIX d qimageblitz - PATHS + HINTS $ENV{QIMAGEBLITZDIR}/lib ${PC_QIMAGEBLITZ_LIBDIR} - ${PC_QIMAGEBLITZ_LIBRARY_DIRS} ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR} ) -- cgit v1.2.1 From f260ed76a36559119dc8e0819bb7e4de063bd0ac Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Sun, 16 Aug 2009 19:59:00 +0000 Subject: Merge pkgconfig vs cmake fix from trunk svn path=/branches/KDE/4.3/kdelibs/; revision=1012108 --- modules/FindPopplerQt4.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/FindPopplerQt4.cmake b/modules/FindPopplerQt4.cmake index fbc1820c..04911bbd 100644 --- a/modules/FindPopplerQt4.cmake +++ b/modules/FindPopplerQt4.cmake @@ -27,11 +27,12 @@ endif(NOT WIN32) find_path(POPPLER_QT4_INCLUDE_DIR NAMES poppler-qt4.h PATH_SUFFIXES poppler/qt4 poppler - PATHS ${_PopplerQt4IncDir} + HINTS ${_PopplerQt4IncDir} ) -find_library(POPPLER_QT4_LIBRARIES poppler-qt4 - ${_PopplerQt4LinkDir} +find_library(POPPLER_QT4_LIBRARIES + NAMES poppler-qt4 + HINTS ${_PopplerQt4LinkDir} ) if (POPPLER_QT4_INCLUDE_DIR AND POPPLER_QT4_LIBRARIES) -- cgit v1.2.1 From ee218eaff7ad13719fced8190cbb0fb0603e1dfd Mon Sep 17 00:00:00 2001 From: David Faure Date: Tue, 18 Aug 2009 22:10:22 +0000 Subject: Backport: Fix detection of Qt's phonon, patch by Pavel Volkovitskiy, approved by Thiago. This needs Qt-4.5.3 when it's out or kde-qt (which has the fix backported). For older versions of Qt, it didn't work before, and it still won't work; we used standalone phonon instead (and most people still do). svn path=/branches/KDE/4.3/kdelibs/; revision=1013128 --- modules/FindQt4.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 70676762..df2c006e 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -738,11 +738,13 @@ IF (QT4_QMAKE_FOUND) ${QT_HEADERS_DIR}/QtXmlPatterns NO_DEFAULT_PATH ) - + # Set QT_PHONON_INCLUDE_DIR - FIND_PATH(QT_PHONON_INCLUDE_DIR phonon + # Qt >= 4.5.3 (or kde-qt-4.5.2 which has the fix too) : Phonon/ClassName is inside include/phonon + # With previous versions of Qt, this could not work; upgrade Qt or use a standalone phonon + FIND_PATH(QT_PHONON_INCLUDE_DIR Phonon PATHS - ${QT_INCLUDE_DIR}/phonon + ${QT_HEADERS_DIR}/phonon NO_DEFAULT_PATH ) -- cgit v1.2.1