From 76b65a95c4dab6390a80d402ac9cb9ad229b01c9 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Thu, 2 Jul 2009 06:01:55 +0000 Subject: Account for CMAKE_EXECUTABLE_SUFFIX in KDE4_*_EXECUTABLE .shell names, since that is how they are created. by cygwin ports maintainer svn path=/trunk/KDE/kdelibs/; revision=990260 --- modules/FindKDE4Internal.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 6ba7c9f6..7932393d 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -389,10 +389,10 @@ if (_kdeBootStrapping) set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets ) else (WIN32) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib ) - set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell ) + set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler${CMAKE_EXECUTABLE_SUFFIX}.shell ) - set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell ) - set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell ) + set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4${CMAKE_EXECUTABLE_SUFFIX}.shell ) + set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets${CMAKE_EXECUTABLE_SUFFIX}.shell ) endif (WIN32) set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}) -- cgit v1.2.1 From 127ef12ad423eb824cf8074bda92efc140e53982 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Thu, 2 Jul 2009 06:02:34 +0000 Subject: Cygwin uses $PATH for runtime library resolution by cygwin ports maintainer svn path=/trunk/KDE/kdelibs/; revision=990261 --- modules/KDE4Macros.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 17a8065e..ef5c61b1 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -500,6 +500,8 @@ macro (KDE4_HANDLE_RPATH_FOR_EXECUTABLE _target_NAME _type) if (UNIX) if (APPLE) set(_library_path_variable "DYLD_LIBRARY_PATH") + elseif (CYGWIN) + set(_library_path_variable "PATH") else (APPLE) set(_library_path_variable "LD_LIBRARY_PATH") endif (APPLE) @@ -572,6 +574,8 @@ macro (KDE4_ADD_PLUGIN _target_NAME _with_PREFIX) if (_first_SRC) set_target_properties(${_target_NAME} PROPERTIES PREFIX "") + else (_first_SRC) + set_target_properties(${_target_NAME} PROPERTIES PREFIX "lib") endif (_first_SRC) if (WIN32) -- cgit v1.2.1 From c1cfe015fbc7f6244fe1fce8920de6088add61ee Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Thu, 2 Jul 2009 06:03:54 +0000 Subject: Python modules should be MODULE, not SHARED, so they are installed correctly and not create import libs on Win32/Cygwin - by cygwin ports maintainer svn path=/trunk/KDE/kdelibs/; revision=990262 --- modules/SIPMacros.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/SIPMacros.cmake b/modules/SIPMacros.cmake index eb5ea06c..6096ccb6 100644 --- a/modules/SIPMacros.cmake +++ b/modules/SIPMacros.cmake @@ -102,8 +102,12 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP) COMMAND ${SIP_EXECUTABLE} ${_sip_tags} ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip} DEPENDS ${_abs_module_sip} ${SIP_EXTRA_FILES_DEPEND} ) - - ADD_LIBRARY(${_logical_name} SHARED ${_sip_output_files} ) + # not sure if type MODULE could be uses anywhere, limit to cygwin for now + IF (CYGWIN) + ADD_LIBRARY(${_logical_name} MODULE ${_sip_output_files} ) + ELSE (CYGWIN) + ADD_LIBRARY(${_logical_name} SHARED ${_sip_output_files} ) + ENDIF (CYGWIN) TARGET_LINK_LIBRARIES(${_logical_name} ${PYTHON_LIBRARY}) TARGET_LINK_LIBRARIES(${_logical_name} ${EXTRA_LINK_LIBRARIES}) SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES PREFIX "" OUTPUT_NAME ${_child_module_name}) -- cgit v1.2.1 From 20c769da015bc819c37256bdcab75aa5186c7ea6 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Thu, 2 Jul 2009 06:05:55 +0000 Subject: could not change commit log after a commit, so revert the part of the patch for which is the comment was forgotten svn path=/trunk/KDE/kdelibs/; revision=990264 --- modules/KDE4Macros.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index ef5c61b1..238076a3 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -574,8 +574,6 @@ macro (KDE4_ADD_PLUGIN _target_NAME _with_PREFIX) if (_first_SRC) set_target_properties(${_target_NAME} PROPERTIES PREFIX "") - else (_first_SRC) - set_target_properties(${_target_NAME} PROPERTIES PREFIX "lib") endif (_first_SRC) if (WIN32) -- cgit v1.2.1 From 287aac90ae08721eeb90c181f4fb442decdb5b95 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Thu, 2 Jul 2009 06:06:42 +0000 Subject: Force the prefix to "lib" so that the plugin name is sure to match the init_ symbol exactly - by cygwin ports maintainer svn path=/trunk/KDE/kdelibs/; revision=990265 --- modules/KDE4Macros.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 238076a3..ef5c61b1 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -574,6 +574,8 @@ macro (KDE4_ADD_PLUGIN _target_NAME _with_PREFIX) if (_first_SRC) set_target_properties(${_target_NAME} PROPERTIES PREFIX "") + else (_first_SRC) + set_target_properties(${_target_NAME} PROPERTIES PREFIX "lib") endif (_first_SRC) if (WIN32) -- cgit v1.2.1 From 7216be1cbfb8cc8b95a6f632dd62cacfa15bdb75 Mon Sep 17 00:00:00 2001 From: Patrick Spendrin Date: Thu, 2 Jul 2009 16:00:31 +0000 Subject: use this for spaces in the path svn path=/trunk/KDE/kdelibs/; revision=990545 --- modules/FindSharedMimeInfo.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FindSharedMimeInfo.cmake b/modules/FindSharedMimeInfo.cmake index 707cb006..9b076a30 100644 --- a/modules/FindSharedMimeInfo.cmake +++ b/modules/FindSharedMimeInfo.cmake @@ -70,7 +70,7 @@ set(DESTDIR_VALUE \"\$ENV{DESTDIR}\") if (NOT DESTDIR_VALUE) # under Windows relative paths are used, that's why it runs from CMAKE_INSTALL_PREFIX execute_process(COMMAND ${UPDATE_MIME_DATABASE_EXECUTABLE} ${_xdgmimeDir} - WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}) + WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}\") endif (NOT DESTDIR_VALUE) ") endmacro (UPDATE_XDG_MIMETYPES) -- cgit v1.2.1 From 80aa9fd27790cd92664da486115cfbc484b0c989 Mon Sep 17 00:00:00 2001 From: Patrick Spendrin Date: Thu, 2 Jul 2009 16:11:54 +0000 Subject: it can work without backslashes of course too svn path=/trunk/KDE/kdelibs/; revision=990546 --- modules/FindSharedMimeInfo.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FindSharedMimeInfo.cmake b/modules/FindSharedMimeInfo.cmake index 9b076a30..8bb8365b 100644 --- a/modules/FindSharedMimeInfo.cmake +++ b/modules/FindSharedMimeInfo.cmake @@ -70,7 +70,7 @@ set(DESTDIR_VALUE \"\$ENV{DESTDIR}\") if (NOT DESTDIR_VALUE) # under Windows relative paths are used, that's why it runs from CMAKE_INSTALL_PREFIX execute_process(COMMAND ${UPDATE_MIME_DATABASE_EXECUTABLE} ${_xdgmimeDir} - WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}\") + WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}") endif (NOT DESTDIR_VALUE) ") endmacro (UPDATE_XDG_MIMETYPES) -- cgit v1.2.1 From 6f621faba414c1c0b0398a1a68194a451f545fc6 Mon Sep 17 00:00:00 2001 From: Patrick Spendrin Date: Thu, 2 Jul 2009 19:28:48 +0000 Subject: the backslashes are definitely needed svn path=/trunk/KDE/kdelibs/; revision=990592 --- modules/FindSharedMimeInfo.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FindSharedMimeInfo.cmake b/modules/FindSharedMimeInfo.cmake index 8bb8365b..9b076a30 100644 --- a/modules/FindSharedMimeInfo.cmake +++ b/modules/FindSharedMimeInfo.cmake @@ -70,7 +70,7 @@ set(DESTDIR_VALUE \"\$ENV{DESTDIR}\") if (NOT DESTDIR_VALUE) # under Windows relative paths are used, that's why it runs from CMAKE_INSTALL_PREFIX execute_process(COMMAND ${UPDATE_MIME_DATABASE_EXECUTABLE} ${_xdgmimeDir} - WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}") + WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}\") endif (NOT DESTDIR_VALUE) ") endmacro (UPDATE_XDG_MIMETYPES) -- cgit v1.2.1 From a513aa5bcd0bd58344a102f1e54376f6f40e2d76 Mon Sep 17 00:00:00 2001 From: Cyrille Berger Skott Date: Sun, 5 Jul 2009 14:04:26 +0000 Subject: Find lcms version using a regexp, instead of compiling a program. svn path=/trunk/KDE/kdelibs/; revision=991725 --- modules/FindLCMS.cmake | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/modules/FindLCMS.cmake b/modules/FindLCMS.cmake index cbb6b179..92604e3d 100644 --- a/modules/FindLCMS.cmake +++ b/modules/FindLCMS.cmake @@ -8,6 +8,7 @@ # Copyright (c) 2008, Adrian Page, +# Copyright (c) 2009, Cyrille Berger, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -17,7 +18,7 @@ # in the FIND_PATH() and FIND_LIBRARY() calls if(NOT WIN32) find_package(PkgConfig) - pkg_check_modules(PC_LCMS QUIET lcms) + pkg_check_modules(PC_LCMS lcms) set(LCMS_DEFINITIONS ${PC_LCMS_CFLAGS_OTHER}) endif(NOT WIN32) @@ -42,34 +43,22 @@ else(LCMS_INCLUDE_DIR AND LCMS_LIBRARIES) endif(LCMS_INCLUDE_DIR AND LCMS_LIBRARIES) if(LCMS_FOUND) - set(FIND_LCMS_VERSION_SOURCE - "#include \n int main()\n {\n return LCMS_VERSION;\n }\n") - set(FIND_LCMS_VERSION_SOURCE_FILE ${CMAKE_BINARY_DIR}/CMakeTmp/FindLCMS.cxx) - file(WRITE "${FIND_LCMS_VERSION_SOURCE_FILE}" "${FIND_LCMS_VERSION_SOURCE}") - - set(FIND_LCMS_VERSION_ADD_INCLUDES - "-DINCLUDE_DIRECTORIES:STRING=${LCMS_INCLUDE_DIR}") - - try_run(LCMS_VERSION LCMS_COMPILE_RESULT - ${CMAKE_BINARY_DIR} - ${FIND_LCMS_VERSION_SOURCE_FILE} - CMAKE_FLAGS "${FIND_LCMS_VERSION_ADD_INCLUDES}" - OUTPUT_VARIABLE OUTPUT) - - if(LCMS_COMPILE_RESULT AND NOT LCMS_VERSION STREQUAL FAILED_TO_RUN) + file(READ ${LCMS_INCLUDE_DIR}/lcms.h LCMS_VERSION_CONTENT) + string(REGEX MATCH "#define LCMS_VERSION[ ]*[0-9]*\n" LCMS_VERSION_MATCH ${LCMS_VERSION_CONTENT}) + if(LCMS_VERSION_MATCH) + message(STATUS "hello") + string(REGEX REPLACE "#define LCMS_VERSION[ ]*([0-9]*)\n" "\\1" LCMS_VERSION ${LCMS_VERSION_MATCH}) if(NOT LCMS_FIND_QUIETLY) string(SUBSTRING ${LCMS_VERSION} 0 1 LCMS_MAJOR_VERSION) string(SUBSTRING ${LCMS_VERSION} 1 2 LCMS_MINOR_VERSION) message(STATUS "Found lcms version ${LCMS_MAJOR_VERSION}.${LCMS_MINOR_VERSION}, ${LCMS_LIBRARIES}") endif(NOT LCMS_FIND_QUIETLY) - else(LCMS_COMPILE_RESULT AND NOT LCMS_VERSION STREQUAL FAILED_TO_RUN) + else(LCMS_VERSION_MATCH) if(NOT LCMS_FIND_QUIETLY) message(STATUS "Found lcms but failed to find version ${LCMS_LIBRARIES}") - file(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log - "Find lcms version failed with the following output:\n${OUTPUT}\nFindLCMS.cxx:\n${FIND_LCMS_VERSION_SOURCE}\n\n") endif(NOT LCMS_FIND_QUIETLY) set(LCMS_VERSION NOTFOUND) - endif(LCMS_COMPILE_RESULT AND NOT LCMS_VERSION STREQUAL FAILED_TO_RUN) + endif(LCMS_VERSION_MATCH) else(LCMS_FOUND) if(NOT LCMS_FIND_QUIETLY) if(LCMS_FIND_REQUIRED) -- cgit v1.2.1 From c547441e914a677fe8d2daf7e94b94b8d64f1124 Mon Sep 17 00:00:00 2001 From: Cyrille Berger Skott Date: Sun, 5 Jul 2009 14:20:09 +0000 Subject: no need to be nice and to welcome people :) (thanks to krop for seeing that ;) ) svn path=/trunk/KDE/kdelibs/; revision=991734 --- modules/FindLCMS.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/FindLCMS.cmake b/modules/FindLCMS.cmake index 92604e3d..2b1f3cd7 100644 --- a/modules/FindLCMS.cmake +++ b/modules/FindLCMS.cmake @@ -46,7 +46,6 @@ if(LCMS_FOUND) file(READ ${LCMS_INCLUDE_DIR}/lcms.h LCMS_VERSION_CONTENT) string(REGEX MATCH "#define LCMS_VERSION[ ]*[0-9]*\n" LCMS_VERSION_MATCH ${LCMS_VERSION_CONTENT}) if(LCMS_VERSION_MATCH) - message(STATUS "hello") string(REGEX REPLACE "#define LCMS_VERSION[ ]*([0-9]*)\n" "\\1" LCMS_VERSION ${LCMS_VERSION_MATCH}) if(NOT LCMS_FIND_QUIETLY) string(SUBSTRING ${LCMS_VERSION} 0 1 LCMS_MAJOR_VERSION) -- cgit v1.2.1 From 7aab253a3d616da4b8569147d12255f3545c6bdb Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sun, 5 Jul 2009 21:28:07 +0000 Subject: Show a fatal error if anyone tries to use FindKdepim. svn path=/trunk/KDE/kdelibs/; revision=991884 --- modules/FindKdepim.cmake | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 modules/FindKdepim.cmake 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 e8e499b81748508ea167e0aa50f69bcb199ba650 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Tue, 7 Jul 2009 14:55:50 +0000 Subject: KDEWIN_INCLUDES and KDEWIN_LIBRARIES need to be set always, not only for the first time svn path=/trunk/KDE/kdelibs/; revision=992670 --- modules/FindKDEWin.cmake | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/modules/FindKDEWin.cmake b/modules/FindKDEWin.cmake index 354ecb91..f034b738 100644 --- a/modules/FindKDEWin.cmake +++ b/modules/FindKDEWin.cmake @@ -14,7 +14,7 @@ if (WIN32) - if (NOT KDEWIN_LIBRARIES) + if (NOT KDEWIN_LIBRARY) find_path(KDEWIN_INCLUDE_DIR kdewin_export.h ${CMAKE_INCLUDE_PATH} @@ -26,9 +26,12 @@ if (WIN32) if (CMAKE_BUILD_TYPE STREQUAL "Debug") set (LIBRARY_NAME kdewind) - else (CMAKE_BUILD_TYPE STREQUAL "Debug") + else(CMAKE_BUILD_TYPE STREQUAL "Debug") set (LIBRARY_NAME kdewin) endif (CMAKE_BUILD_TYPE STREQUAL "Debug") + if (MSVC_IDE ) + set (LIBRARY_NAME "kdewind") + endif (MSVC_IDE) find_library(KDEWIN_LIBRARY NAMES ${LIBRARY_NAME} @@ -37,28 +40,27 @@ if (WIN32) ${CMAKE_INSTALL_PREFIX}/lib NO_SYSTEM_ENVIRONMENT_PATH ) + endif (NOT KDEWIN_LIBRARY) - if (KDEWIN_LIBRARY AND KDEWIN_INCLUDE_DIR) - set(KDEWIN_FOUND TRUE) - # add needed system libs - set(KDEWIN_LIBRARIES ${KDEWIN_LIBRARY} user32 shell32 ws2_32 netapi32 userenv) - - if (MINGW) - #mingw compiler - set(KDEWIN_INCLUDES ${KDEWIN_INCLUDE_DIR} ${KDEWIN_INCLUDE_DIR}/mingw ${QT_INCLUDES}) - else (MINGW) - # msvc compiler - # add the MS SDK include directory if available - file(TO_CMAKE_PATH "$ENV{MSSDK}" MSSDK_DIR) - set(KDEWIN_INCLUDES ${KDEWIN_INCLUDE_DIR} ${KDEWIN_INCLUDE_DIR}/msvc ${QT_INCLUDES} ${MSSDK_DIR}) - endif (MINGW) - - endif (KDEWIN_LIBRARY AND KDEWIN_INCLUDE_DIR) - # required for configure - set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${KDEWIN_INCLUDES}) - set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${KDEWIN_LIBRARIES}) + if (KDEWIN_LIBRARY AND KDEWIN_INCLUDE_DIR) + set(KDEWIN_FOUND TRUE) + # add needed system libs + set(KDEWIN_LIBRARIES ${KDEWIN_LIBRARY} user32 shell32 ws2_32 netapi32 userenv) - endif (NOT KDEWIN_LIBRARIES) + if (MINGW) + #mingw compiler + set(KDEWIN_INCLUDES ${KDEWIN_INCLUDE_DIR} ${KDEWIN_INCLUDE_DIR}/mingw ${QT_INCLUDES}) + else (MINGW) + # msvc compiler + # add the MS SDK include directory if available + file(TO_CMAKE_PATH "$ENV{MSSDK}" MSSDK_DIR) + set(KDEWIN_INCLUDES ${KDEWIN_INCLUDE_DIR} ${KDEWIN_INCLUDE_DIR}/msvc ${QT_INCLUDES} ${MSSDK_DIR}) + endif (MINGW) + + endif (KDEWIN_LIBRARY AND KDEWIN_INCLUDE_DIR) + # required for configure + set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${KDEWIN_INCLUDES}) + set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${KDEWIN_LIBRARIES}) if (KDEWIN_FOUND) if (NOT KDEWIN_FIND_QUIETLY) -- cgit v1.2.1 From 830d26307d0e3fc93c25cea04a9bac0b2dded13a Mon Sep 17 00:00:00 2001 From: Harald Fernengel Date: Thu, 9 Jul 2009 17:18:00 +0000 Subject: enable QT_USE_FAST_OPERATOR_PLUS and QT_USE_FAST_CONCATENATION svn path=/trunk/KDE/kdelibs/; revision=993910 --- modules/FindQt4.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 52359172..56ba8f21 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -307,7 +307,7 @@ INCLUDE(MacroPushRequiredVars) SET(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake) -SET( QT_DEFINITIONS "") +SET( QT_DEFINITIONS -DQT_USE_FAST_OPERATOR_PLUS -DQT_USE_FAST_CONCATENATION) IF (WIN32) SET(QT_DEFINITIONS -DQT_DLL) -- cgit v1.2.1 From 0c35434924122153d0fe34c7b3d054cf56b2e33a Mon Sep 17 00:00:00 2001 From: Harald Fernengel Date: Thu, 9 Jul 2009 17:23:37 +0000 Subject: whoops - revert last change, this should not have gone in svn path=/trunk/KDE/kdelibs/; revision=993915 --- modules/FindQt4.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 56ba8f21..52359172 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -307,7 +307,7 @@ INCLUDE(MacroPushRequiredVars) SET(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake) -SET( QT_DEFINITIONS -DQT_USE_FAST_OPERATOR_PLUS -DQT_USE_FAST_CONCATENATION) +SET( QT_DEFINITIONS "") IF (WIN32) SET(QT_DEFINITIONS -DQT_DLL) -- cgit v1.2.1 From e4e6fac4f2ca0786ded3922b574273d127d6f417 Mon Sep 17 00:00:00 2001 From: Mike Arthur Date: Thu, 9 Jul 2009 19:21:01 +0000 Subject: Add Qt Webkit framework support. svn path=/trunk/KDE/kdelibs/; revision=993948 --- modules/FindQt4.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 52359172..3506a548 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 0ce3a1e6440db8190a4c7da5535b632df76bf1cb Mon Sep 17 00:00:00 2001 From: David Faure Date: Sun, 12 Jul 2009 22:37:46 +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 [hidden symbol]) svn path=/trunk/KDE/kdelibs/; revision=995537 --- modules/KDE4Macros.cmake | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index ef5c61b1..1b7a934e 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -578,13 +578,11 @@ macro (KDE4_ADD_PLUGIN _target_NAME _with_PREFIX) set_target_properties(${_target_NAME} PROPERTIES PREFIX "lib") 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 00a6480f957d06b8679c1e62cded97402fb10e50 Mon Sep 17 00:00:00 2001 From: Romain Pokrzywka Date: Tue, 14 Jul 2009 12:50:30 +0000 Subject: arf, this little bugger took me two hours to find :-o svn path=/trunk/KDE/kdelibs/; revision=996456 --- modules/FindKDEWin.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/FindKDEWin.cmake b/modules/FindKDEWin.cmake index f034b738..469ba3dc 100644 --- a/modules/FindKDEWin.cmake +++ b/modules/FindKDEWin.cmake @@ -63,13 +63,13 @@ if (WIN32) set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${KDEWIN_LIBRARIES}) if (KDEWIN_FOUND) - if (NOT KDEWIN_FIND_QUIETLY) - message(STATUS "Found KDEWIN library: ${KDEWIN_LIBRARY}") - endif (NOT KDEWIN_FIND_QUIETLY) + if (NOT KDEWin_FIND_QUIETLY) + message(STATUS "Found KDEWin library: ${KDEWIN_LIBRARY}") + endif (NOT KDEWin_FIND_QUIETLY) else (KDEWIN_FOUND) - if (KDEWIN_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find KDEWIN library\nPlease install it first") - endif (KDEWIN_FIND_REQUIRED) + if (KDEWin_FIND_REQUIRED) + message(FATAL_ERROR "Could NOT find KDEWin library\nPlease install it first") + endif (KDEWin_FIND_REQUIRED) endif (KDEWIN_FOUND) endif (WIN32) -- cgit v1.2.1 From b4ba1600ca61259417da8571b14d0d924f0fe862 Mon Sep 17 00:00:00 2001 From: Romain Pokrzywka Date: Tue, 14 Jul 2009 13:14:04 +0000 Subject: add the standard KDE paths to the include/lib search paths, useful when KDE is built with emerge svn path=/trunk/KDE/kdelibs/; revision=996461 --- modules/FindKDEWin.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/FindKDEWin.cmake b/modules/FindKDEWin.cmake index 469ba3dc..2da5384e 100644 --- a/modules/FindKDEWin.cmake +++ b/modules/FindKDEWin.cmake @@ -17,6 +17,7 @@ if (WIN32) if (NOT KDEWIN_LIBRARY) find_path(KDEWIN_INCLUDE_DIR kdewin_export.h + ${KDE4_INCLUDE_DIR} ${CMAKE_INCLUDE_PATH} ${CMAKE_INSTALL_PREFIX}/include ) @@ -36,6 +37,7 @@ if (WIN32) find_library(KDEWIN_LIBRARY NAMES ${LIBRARY_NAME} PATHS + ${KDE4_LIB_DIR} ${_cmakeLibraryPathCmakeStyle} ${CMAKE_INSTALL_PREFIX}/lib NO_SYSTEM_ENVIRONMENT_PATH -- cgit v1.2.1 From add341781f3c8c3be79c2e68201ddfcfe1de421c Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Fri, 24 Jul 2009 20:05:10 +0000 Subject: -search also for SopranoAddOntology.cmake and include it automatically if found Alex svn path=/trunk/KDE/kdelibs/; revision=1002028 --- modules/FindSoprano.cmake | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/modules/FindSoprano.cmake b/modules/FindSoprano.cmake index fb84c2e4..e40275cd 100644 --- a/modules/FindSoprano.cmake +++ b/modules/FindSoprano.cmake @@ -47,6 +47,18 @@ ${KDE4_INCLUDE_DIR} ) + # find the cmake macro file installed by soprano, relative to the include dir + get_filename_component(_SOPRANO_PREFIX ${SOPRANO_INCLUDE_DIR} PATH) + # first check in /share/soprano/cmake, if it's not found there, check in /share/apps/cmake/modules + # find_file(_SOPRANO_MACRO_FILE NAMES SopranoAddOntology.cmake HINTS ${_SOPRANO_PREFIX}/share/soprano/cmake ) + find_file(_SOPRANO_MACRO_FILE NAMES SopranoAddOntology.cmake HINTS ${_SOPRANO_PREFIX}/share/apps/cmake/modules ) + + # since which version of soprano is this file installed ? + # we should fail if the file is not found but SOPRANO_MIN_VERSION is bigger than this version. + if(_SOPRANO_MACRO_FILE) + include(${_SOPRANO_MACRO_FILE}) + endif(_SOPRANO_MACRO_FILE) + find_library_with_debug(SOPRANO_INDEX_LIBRARIES WIN32_DEBUG_POSTFIX d NAMES @@ -208,6 +220,8 @@ mark_as_advanced(SOPRANO_CLIENT_LIBRARIES SOPRANO_LIBRARIES SOPRANO_SERVER_LIBRARIES SOPRANO_INCLUDE_DIR - SOPRANO_PLUGIN_DIR) + SOPRANO_PLUGIN_DIR + _SOPRANO_MACRO_FILE + ) #endif(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES AND SOPRANO_INDEX_LIBRARIES AND SOPRANO_SERVER_LIBRARIES) -- cgit v1.2.1 From a9ed3a40905c027bbc94de8066d48b27a38b5570 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sun, 26 Jul 2009 12:50:57 +0000 Subject: First step to implement hunspell plugins svn path=/trunk/KDE/kdelibs/; revision=1002571 --- modules/FindHUNSPELL.cmake | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 modules/FindHUNSPELL.cmake diff --git a/modules/FindHUNSPELL.cmake b/modules/FindHUNSPELL.cmake new file mode 100644 index 00000000..30f37730 --- /dev/null +++ b/modules/FindHUNSPELL.cmake @@ -0,0 +1,25 @@ +# - Try to find HUNSPELL +# Once done this will define +# +# HUNSPELL_FOUND - system has HUNSPELL +# HUNSPELL_INCLUDE_DIR - the HUNSPELL include directory +# HUNSPELL_LIBRARIES - The libraries needed to use HUNSPELL +# HUNSPELL_DEFINITIONS - Compiler switches required for using HUNSPELL + + +IF (HUNSPELL_INCLUDE_DIR AND HUNSPELL_LIBRARIES) + # Already in cache, be silent + SET(HUNSPELL_FIND_QUIETLY TRUE) +ENDIF (HUNSPELL_INCLUDE_DIR AND HUNSPELL_LIBRARIES) + +FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx ) + +FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.2) + +# handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(HUNSPELL DEFAULT_MSG HUNSPELL_LIBRARIES HUNSPELL_INCLUDE_DIR) + + +MARK_AS_ADVANCED(HUNSPELL_INCLUDE_DIR HUNSPELL_LIBRARIES) -- cgit v1.2.1 From 3208b1d4a10c81c23be871c7a74f77de49c3aeaf Mon Sep 17 00:00:00 2001 From: Sebastian Trueg Date: Wed, 29 Jul 2009 18:19:01 +0000 Subject: Forwardport: also include the path to the soprano cmake macro into the cmake module path. This way the macro can be used without being included manually but also by including it. svn path=/trunk/KDE/kdelibs/; revision=1004264 --- modules/FindSoprano.cmake | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/modules/FindSoprano.cmake b/modules/FindSoprano.cmake index e40275cd..29331cf9 100644 --- a/modules/FindSoprano.cmake +++ b/modules/FindSoprano.cmake @@ -47,18 +47,6 @@ ${KDE4_INCLUDE_DIR} ) - # find the cmake macro file installed by soprano, relative to the include dir - get_filename_component(_SOPRANO_PREFIX ${SOPRANO_INCLUDE_DIR} PATH) - # first check in /share/soprano/cmake, if it's not found there, check in /share/apps/cmake/modules - # find_file(_SOPRANO_MACRO_FILE NAMES SopranoAddOntology.cmake HINTS ${_SOPRANO_PREFIX}/share/soprano/cmake ) - find_file(_SOPRANO_MACRO_FILE NAMES SopranoAddOntology.cmake HINTS ${_SOPRANO_PREFIX}/share/apps/cmake/modules ) - - # since which version of soprano is this file installed ? - # we should fail if the file is not found but SOPRANO_MIN_VERSION is bigger than this version. - if(_SOPRANO_MACRO_FILE) - include(${_SOPRANO_MACRO_FILE}) - endif(_SOPRANO_MACRO_FILE) - find_library_with_debug(SOPRANO_INDEX_LIBRARIES WIN32_DEBUG_POSTFIX d NAMES @@ -186,6 +174,23 @@ set(_plugins "${_plugins} virtuosobackend") endif(EXISTS ${SOPRANO_PLUGIN_DIR}/virtuosobackend.desktop) + # make sure the Soprano cmake macros are found + # We also include it directly for convinience + 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 + include(${_SOPRANO_MACRO_FILE}) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${_SOPRANO_PREFIX}/share/soprano/cmake) + else(_SOPRANO_MACRO_FILE) + # the old Soprano 2.3.0 location + find_file(_SOPRANO_MACRO_FILE_OLD NAMES SopranoAddOntology.cmake HINTS ${_SOPRANO_PREFIX}/share/apps/cmake/modules ) + if(_SOPRANO_MACRO_FILE_OLD) + include(${_SOPRANO_MACRO_FILE_OLD}) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${_SOPRANO_PREFIX}/share/apps/cmake/modules) + endif(_SOPRANO_MACRO_FILE_OLD) + endif(_SOPRANO_MACRO_FILE) + endif(Soprano_FOUND) if(Soprano_FOUND) -- cgit v1.2.1