From 85d473f074935cb2f04e90b1e5d42b72e98fe971 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 28 Jan 2008 06:38:25 +0000 Subject: fix symlink installation (backport from trunk) svn path=/branches/KDE/4.0/kdelibs/; revision=767492 --- modules/KDE4Macros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 4a975088..247eda79 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -308,7 +308,7 @@ macro (KDE4_CREATE_HANDBOOK _docbook) # TODO symlinks on non-unix platforms if (UNIX) # execute some cmake code on make install which creates the symlink - install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${_installDest}/common\" \"${_installDest}/${dirname}/common\" )" ) + install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${_installDest}/common\" \"\$ENV{DESTDIR}${_installDest}/${dirname}/common\" )" ) endif (UNIX) endif(_installDest) -- cgit v1.2.1 From 6fbe5347cd9211a6d3ed39bfa63f14b7e00dfd69 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Mon, 28 Jan 2008 14:56:13 +0000 Subject: Backport fix for FLAC > 1.1.2. CCBUG: 153503 svn path=/branches/KDE/4.0/kdelibs/; revision=767696 --- 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 ce1f614b47054bd06df4d14521ee62f28d186552 Mon Sep 17 00:00:00 2001 From: David Johnson Date: Tue, 29 Jan 2008 17:20:02 +0000 Subject: adjust order of includes svn path=/branches/KDE/4.0/kdelibs/; revision=768282 --- 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 bab5fb96..fa62e7bd 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 4c1a6b4bc17df1c31a7aa6b5d37ff336342ba9e0 Mon Sep 17 00:00:00 2001 From: David Johnson Date: Sat, 2 Feb 2008 21:18:21 +0000 Subject: Place Qt includes before platform/X11 includes svn path=/branches/KDE/4.0/kdelibs/; revision=770128 --- modules/FindKDE4Internal.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index fa62e7bd..03b0e307 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