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/ECMUseFindModules.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/ECMUseFindModules.cmake')
| -rw-r--r-- | modules/ECMUseFindModules.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/ECMUseFindModules.cmake b/modules/ECMUseFindModules.cmake index 20e4cdcf..f7979e45 100644 --- a/modules/ECMUseFindModules.cmake +++ b/modules/ECMUseFindModules.cmake @@ -1,11 +1,11 @@ -# - Selectively use some of the Find-modules provided by extra-cmake-modules +# - Selectively use some of the Find-modules provided by extra-cmake-modules (ECM) # # ECM_USE_FIND_MODULES(DIR <dir> MODULES module1.cmake module2.cmake .. moduleN.cmake [NO_OVERRIDE] ) # # This macro is automatically available once extra-cmake-modules has been found, so it is not # necessary to include(ECMUseFindModules) explictely. # -# Use this macro instead of simply adding ${EXTRA_CMAKE_MODULES_FIND_MODULE_DIR} to CMAKE_MODULE_PATH +# Use this macro instead of simply adding ${ECM_FIND_MODULE_DIR} to CMAKE_MODULE_PATH # if you want to use only a subset or some specific find-modules coming with extra-cmake-modules. # The given find-modules will be copied to the given directory. This directory should then be added # to CMAKE_MODULE_PATH. The given modules override modules of the same name coming with CMake, except @@ -19,7 +19,7 @@ # CMake version # # Example: -# find_package(extra-cmake-modules 0.0.2 REQUIRED) +# find_package(ECM 0.0.4 REQUIRED) # ecm_use_find_modules(DIR ${CMAKE_BINARY_DIR}/cmake/ Modules FindBlueZ.cmake NO_OVERRIDE ) # set(CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR}/cmake/ ) # @@ -53,11 +53,11 @@ function(ecm_use_find_modules) file(MAKE_DIRECTORY "${EUFM_DIR}") foreach(file ${EUFM_MODULES}) - if(NOT EXISTS ${EXTRA_CMAKE_MODULES_FIND_MODULE_DIR}/${file} ) - message(FATAL_ERROR "File ${file} not found in ${EXTRA_CMAKE_MODULES_FIND_MODULE_DIR} !") + if(NOT EXISTS ${ECM_FIND_MODULE_DIR}/${file} ) + message(FATAL_ERROR "File ${file} not found in ${ECM_FIND_MODULE_DIR} !") endif() if(NOT EXISTS "${CMAKE_ROOT}/Modules/${file}" OR NOT EUFM_NO_OVERRIDE) - configure_file("${EXTRA_CMAKE_MODULES_FIND_MODULE_DIR}/${file}" "${EUFM_DIR}/${file}" COPYONLY) + configure_file("${ECM_FIND_MODULE_DIR}/${file}" "${EUFM_DIR}/${file}" COPYONLY) endif() endforeach() |