diff options
| author | Alex Neundorf <neundorf@kde.org> | 2012-05-12 21:25:36 +0200 |
|---|---|---|
| committer | Alex Neundorf <neundorf@kde.org> | 2012-05-12 21:28:58 +0200 |
| commit | 653895414dca71dde86dd78f493b5b646bb36ab7 (patch) | |
| tree | d98c7c6dd574ff78986f060f41785d8c4ffb73f2 /modules/ECMQtFramework.cmake | |
| parent | 0f46b993438abce7a2b90c7ba720427cbe827e8d (diff) | |
| download | extra-cmake-modules-653895414dca71dde86dd78f493b5b646bb36ab7.tar.gz extra-cmake-modules-653895414dca71dde86dd78f493b5b646bb36ab7.tar.bz2 | |
rework of extra-cmake-modules
-rename the cmake package from extra-cmake-modules to ECM
-change variable names and docs accordingly
-move setting of Qt-related defines from ECMQtFrameworks.cmake to KDECompilerSettings.cmake
-remove ECMSetVersionVariables.cmake, we'll do it some other way
-rename ECMConfig.cmake.in to ECMQtFrameworkConfig.cmake.in, since this is where it is used, and it would have the same name as ECMConfig.cmake.in which is for extra-cmake-modules itself
Alex
Diffstat (limited to 'modules/ECMQtFramework.cmake')
| -rw-r--r-- | modules/ECMQtFramework.cmake | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/modules/ECMQtFramework.cmake b/modules/ECMQtFramework.cmake index 5cc428bd..fdbb6de9 100644 --- a/modules/ECMQtFramework.cmake +++ b/modules/ECMQtFramework.cmake @@ -89,21 +89,6 @@ include(FeatureSummary) -include(${CMAKE_CURRENT_LIST_DIR}/../kde-modules/KDEInstallDirs.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/../kde-modules/KDECMakeSettings.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/../kde-modules/KDECompilerSettings.cmake) - - -add_definitions(-DQT_NO_CAST_TO_ASCII) -add_definitions(-DQT_NO_CAST_FROM_ASCII) -add_definitions(-DQT_STRICT_ITERATORS) -add_definitions(-DQT_NO_URL_CAST_FROM_STRING) -add_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) -add_definitions(-DQT_NO_KEYWORDS) -add_definitions(-DQT_USE_FAST_CONCATENATION) -add_definitions(-DQT_USE_FAST_OPERATOR_PLUS) - - set(LIBRARY_TYPE SHARED) set(ECM_TARGET_DEFAULT_ARGS @@ -115,12 +100,13 @@ set(ECM_TARGET_DEFAULT_ARGS set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/${PROJECT_NAME}") -file(RELATIVE_PATH relInstallDir "${CMAKE_INSTALL_PREFIX}/${CMAKECONFIG_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}") +include(CMakePackageConfigHelpers) -configure_file( - "${CMAKE_CURRENT_LIST_DIR}/ECMConfig.cmake.in" +configure_package_config_file( + "${CMAKE_CURRENT_LIST_DIR}/ECMQtFrameworkConfig.cmake.in" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config.cmake" - @ONLY + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} + PATH_VARS INCLUDE_INSTALL_DIR LIB_INSTALL_DIR CMAKE_INSTALL_PREFIX ) include(WriteBasicConfigVersionFile) |