From 25ad300039650c3aad5919abe9ae95a525e14701 Mon Sep 17 00:00:00 2001 From: Carlo Segato Date: Sun, 9 Aug 2009 22:20:33 +0000 Subject: don't use visibility on windows with gcc 4.4 svn path=/trunk/KDE/kdelibs/; revision=1009407 --- modules/FindKDE4Internal.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 7932393d..fff9cf89 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 967c0cbe1f5dabd2825fc2bc42b14403458b7185 Mon Sep 17 00:00:00 2001 From: Carlo Segato Date: Sun, 9 Aug 2009 22:30:38 +0000 Subject: 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=/trunk/KDE/kdelibs/; revision=1009414 --- modules/FindKDE4Internal.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index fff9cf89..adb6e8c7 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 2c46da6e2a12fcd5355004d59b43017285966d9d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 11 Aug 2009 08:50:07 +0000 Subject: Use HINTS not PATHS for paths discovered by PkgConfig svn path=/trunk/KDE/kdelibs/; revision=1009922 --- 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 2c993c081c491ff0f686890212d7b01c801c01b1 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 11 Aug 2009 08:51:12 +0000 Subject: Use HINTS, not PATHS for pkg-config discovered paths svn path=/trunk/KDE/kdelibs/; revision=1009923 --- 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 8b88d351ff98ef6d04cfc0042bb7276412bfb6ef Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Mon, 17 Aug 2009 12:11:08 +0000 Subject: increase the .so versioning also replace a couple 4.3 -> 4.4 messages svn path=/trunk/KDE/kdelibs/; revision=1012303 --- modules/FindKDE4Internal.cmake | 4 ++-- modules/KDE4Defaults.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index adb6e8c7..91567585 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -1153,13 +1153,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.3 include dir: ${KDE4_INCLUDE_DIR}") + message(STATUS "Found KDE 4.4 include dir: ${KDE4_INCLUDE_DIR}") else(KDE4_INCLUDE_DIR) message(STATUS "ERROR: unable to find the KDE 4 headers") endif(KDE4_INCLUDE_DIR) if(KDE4_LIB_DIR) - message(STATUS "Found KDE 4.3 library dir: ${KDE4_LIB_DIR}") + message(STATUS "Found KDE 4.4 library dir: ${KDE4_LIB_DIR}") else(KDE4_LIB_DIR) message(STATUS "ERROR: unable to find the KDE 4 core library") endif(KDE4_LIB_DIR) diff --git a/modules/KDE4Defaults.cmake b/modules/KDE4Defaults.cmake index 1f2d07c0..bc27a2db 100644 --- a/modules/KDE4Defaults.cmake +++ b/modules/KDE4Defaults.cmake @@ -24,11 +24,11 @@ set(CMAKE_COLOR_MAKEFILE ON) # define the generic version of the libraries here # this makes it easy to advance it when the next KDE release comes # Use this version number for libraries which are at version n in KDE version n -set(GENERIC_LIB_VERSION "4.3.0") +set(GENERIC_LIB_VERSION "4.4.0") set(GENERIC_LIB_SOVERSION "4") # Use this version number for libraries which are already at version n+1 in KDE version n -set(KDE_NON_GENERIC_LIB_VERSION "5.3.0") +set(KDE_NON_GENERIC_LIB_VERSION "5.4.0") set(KDE_NON_GENERIC_LIB_SOVERSION "5") # windows does not support LD_LIBRARY_PATH or similar -- cgit v1.2.1 From f4ec59c58b550bf314c75cea38a18d2538404601 Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 17 Aug 2009 16:44:13 +0000 Subject: Use -o rather than > so that we don't get an empty file on error (e.g. "qdbuscpp2xml: could not execute moc") (empty file which itself will lead to a different error message next time) Can this be merged into cmake's FindQt4.cmake? Thanks. CCMAIL: kde-buildsystem@kde.org svn path=/trunk/KDE/kdelibs/; revision=1012421 --- modules/FindQt4.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 3506a548..3ed05c06 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -1335,7 +1335,7 @@ IF (QT4_QMAKE_FOUND) ENDIF (_customName) ADD_CUSTOM_COMMAND(OUTPUT ${_target} - COMMAND ${QT_DBUSCPP2XML_EXECUTABLE} ${_qt4_dbus_options} ${_in_file} > ${_target} + COMMAND ${QT_DBUSCPP2XML_EXECUTABLE} ${_qt4_dbus_options} ${_in_file} -o ${_target} DEPENDS ${_in_file} ) ENDMACRO(QT4_GENERATE_DBUS_INTERFACE) -- cgit v1.2.1