diff options
-rw-r--r-- | modules/FindEigen2.cmake | 5 | ||||
-rw-r--r-- | modules/FindHUNSPELL.cmake | 25 | ||||
-rw-r--r-- | modules/FindKDE4Internal.cmake | 10 | ||||
-rw-r--r-- | modules/FindKDEWin.cmake | 60 | ||||
-rw-r--r-- | modules/FindLCMS.cmake | 28 | ||||
-rw-r--r-- | modules/FindQt4.cmake | 12 | ||||
-rw-r--r-- | modules/FindSasl2.cmake | 4 | ||||
-rw-r--r-- | modules/FindSharedMimeInfo.cmake | 2 | ||||
-rw-r--r-- | modules/FindSoprano.cmake | 14 | ||||
-rw-r--r-- | modules/KDE4Defaults.cmake | 4 | ||||
-rw-r--r-- | modules/KDE4Macros.cmake | 4 | ||||
-rw-r--r-- | modules/SIPMacros.cmake | 8 |
12 files changed, 69 insertions, 107 deletions
diff --git a/modules/FindEigen2.cmake b/modules/FindEigen2.cmake index 0e86aaf2..8679a36b 100644 --- a/modules/FindEigen2.cmake +++ b/modules/FindEigen2.cmake @@ -1,9 +1,4 @@ # - Try to find Eigen2 lib -# -# This module supports requiring a minimum version, e.g. you can do -# find_package(Eigen2 2.0.3) -# to require version 2.0.3 to newer of Eigen2. -# # Once done this will define # # EIGEN2_FOUND - system has eigen lib with correct version diff --git a/modules/FindHUNSPELL.cmake b/modules/FindHUNSPELL.cmake deleted file mode 100644 index 30f37730..00000000 --- a/modules/FindHUNSPELL.cmake +++ /dev/null @@ -1,25 +0,0 @@ -# - 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) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 91567585..e3478339 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${CMAKE_EXECUTABLE_SUFFIX}.shell ) + set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.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 ) + set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell ) + set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell ) endif (WIN32) set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}) @@ -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.4 include dir: ${KDE4_INCLUDE_DIR}") + message(STATUS "Found KDE 4.3 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.4 library dir: ${KDE4_LIB_DIR}") + message(STATUS "Found KDE 4.3 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/FindKDEWin.cmake b/modules/FindKDEWin.cmake index 2da5384e..354ecb91 100644 --- a/modules/FindKDEWin.cmake +++ b/modules/FindKDEWin.cmake @@ -14,10 +14,9 @@ if (WIN32) - if (NOT KDEWIN_LIBRARY) + if (NOT KDEWIN_LIBRARIES) find_path(KDEWIN_INCLUDE_DIR kdewin_export.h - ${KDE4_INCLUDE_DIR} ${CMAKE_INCLUDE_PATH} ${CMAKE_INSTALL_PREFIX}/include ) @@ -27,51 +26,48 @@ 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} PATHS - ${KDE4_LIB_DIR} ${_cmakeLibraryPathCmakeStyle} ${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 (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 (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}) + endif (NOT 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) diff --git a/modules/FindLCMS.cmake b/modules/FindLCMS.cmake index 2b1f3cd7..cbb6b179 100644 --- a/modules/FindLCMS.cmake +++ b/modules/FindLCMS.cmake @@ -8,7 +8,6 @@ # Copyright (c) 2008, Adrian Page, <adrian@pagenet.plus.com> -# Copyright (c) 2009, Cyrille Berger, <cberger@cberger.net> # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -18,7 +17,7 @@ # in the FIND_PATH() and FIND_LIBRARY() calls if(NOT WIN32) find_package(PkgConfig) - pkg_check_modules(PC_LCMS lcms) + pkg_check_modules(PC_LCMS QUIET lcms) set(LCMS_DEFINITIONS ${PC_LCMS_CFLAGS_OTHER}) endif(NOT WIN32) @@ -43,21 +42,34 @@ else(LCMS_INCLUDE_DIR AND LCMS_LIBRARIES) endif(LCMS_INCLUDE_DIR AND LCMS_LIBRARIES) 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) - string(REGEX REPLACE "#define LCMS_VERSION[ ]*([0-9]*)\n" "\\1" LCMS_VERSION ${LCMS_VERSION_MATCH}) + set(FIND_LCMS_VERSION_SOURCE + "#include <lcms.h>\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) 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_VERSION_MATCH) + else(LCMS_COMPILE_RESULT AND NOT LCMS_VERSION STREQUAL FAILED_TO_RUN) 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_VERSION_MATCH) + endif(LCMS_COMPILE_RESULT AND NOT LCMS_VERSION STREQUAL FAILED_TO_RUN) else(LCMS_FOUND) if(NOT LCMS_FIND_QUIETLY) if(LCMS_FIND_REQUIRED) diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 3ed05c06..df2c006e 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -727,7 +727,7 @@ IF (QT4_QMAKE_FOUND) PATHS ${QT_INCLUDE_DIR}/QtWebKit ${QT_HEADERS_DIR}/QtWebKit - ${QT_LIBRARY_DIR}/QtWebKit.framework/Headers + ${QT_LIBRARY_DIR}/QtWebkit.framework/Headers NO_DEFAULT_PATH ) @@ -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 ) @@ -1335,7 +1337,7 @@ IF (QT4_QMAKE_FOUND) ENDIF (_customName) ADD_CUSTOM_COMMAND(OUTPUT ${_target} - COMMAND ${QT_DBUSCPP2XML_EXECUTABLE} ${_qt4_dbus_options} ${_in_file} -o ${_target} + COMMAND ${QT_DBUSCPP2XML_EXECUTABLE} ${_qt4_dbus_options} ${_in_file} > ${_target} DEPENDS ${_in_file} ) ENDMACRO(QT4_GENERATE_DBUS_INTERFACE) diff --git a/modules/FindSasl2.cmake b/modules/FindSasl2.cmake index 787b578c..855266fc 100644 --- a/modules/FindSasl2.cmake +++ b/modules/FindSasl2.cmake @@ -19,9 +19,7 @@ endif (SASL2_INCLUDE_DIR) FIND_PATH(SASL2_INCLUDE_DIR sasl/sasl.h ) -# libsasl2 add for windows, because the windows package of cyrus-sasl2 -# contains a libsasl2 also for msvc which is not standard conform -FIND_LIBRARY(SASL2_LIBRARIES NAMES sasl2 libsasl2 +FIND_LIBRARY(SASL2_LIBRARIES NAMES sasl2 ) include(FindPackageHandleStandardArgs) diff --git a/modules/FindSharedMimeInfo.cmake b/modules/FindSharedMimeInfo.cmake index 9b076a30..707cb006 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) diff --git a/modules/FindSoprano.cmake b/modules/FindSoprano.cmake index 29331cf9..65c22561 100644 --- a/modules/FindSoprano.cmake +++ b/modules/FindSoprano.cmake @@ -173,22 +173,16 @@ 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 - # 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) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${_SOPRANO_PREFIX}/share/apps/cmake/modules) endif(_SOPRANO_MACRO_FILE) endif(Soprano_FOUND) @@ -225,8 +219,6 @@ mark_as_advanced(SOPRANO_CLIENT_LIBRARIES SOPRANO_LIBRARIES SOPRANO_SERVER_LIBRARIES SOPRANO_INCLUDE_DIR - SOPRANO_PLUGIN_DIR - _SOPRANO_MACRO_FILE - ) + SOPRANO_PLUGIN_DIR) #endif(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES AND SOPRANO_INDEX_LIBRARIES AND SOPRANO_SERVER_LIBRARIES) diff --git a/modules/KDE4Defaults.cmake b/modules/KDE4Defaults.cmake index bc27a2db..1f2d07c0 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.4.0") +set(GENERIC_LIB_VERSION "4.3.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.4.0") +set(KDE_NON_GENERIC_LIB_VERSION "5.3.0") set(KDE_NON_GENERIC_LIB_SOVERSION "5") # windows does not support LD_LIBRARY_PATH or similar diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 1b7a934e..cf33ad35 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -500,8 +500,6 @@ 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) @@ -574,8 +572,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) # for shared libraries/plugins a -DMAKE_target_LIB is required diff --git a/modules/SIPMacros.cmake b/modules/SIPMacros.cmake index 6096ccb6..eb5ea06c 100644 --- a/modules/SIPMacros.cmake +++ b/modules/SIPMacros.cmake @@ -102,12 +102,8 @@ 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} ) - # 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) + + ADD_LIBRARY(${_logical_name} SHARED ${_sip_output_files} ) 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}) |