diff options
| author | Allen Winter <allen.winter@kdab.com> | 2011-09-17 13:19:45 -0400 |
|---|---|---|
| committer | Allen Winter <allen.winter@kdab.com> | 2011-09-17 13:19:45 -0400 |
| commit | bf2ecfb4211eab489fca88d3149dcd75bfdc595e (patch) | |
| tree | 6f7530f28c17f304a4ed4a9c8d62b1a3686a5c15 | |
| parent | 0eb0e68dbfbae9591f060ba9d90cc9a690e1fe26 (diff) | |
| download | extra-cmake-modules-bf2ecfb4211eab489fca88d3149dcd75bfdc595e.tar.gz extra-cmake-modules-bf2ecfb4211eab489fca88d3149dcd75bfdc595e.tar.bz2 | |
a bit of cleaning using cmakelint.py
| -rw-r--r-- | modules/ECMOptionalAddSubdirectory.cmake | 34 | ||||
| -rw-r--r-- | modules/ECMQtFramework.cmake | 20 |
2 files changed, 27 insertions, 27 deletions
diff --git a/modules/ECMOptionalAddSubdirectory.cmake b/modules/ECMOptionalAddSubdirectory.cmake index 192d1f4b..ef6592a0 100644 --- a/modules/ECMOptionalAddSubdirectory.cmake +++ b/modules/ECMOptionalAddSubdirectory.cmake @@ -1,5 +1,5 @@ # - ECM_OPTIONAL_ADD_SUBDIRECTORY() combines ADD_SUBDIRECTORY() with an OPTION() -# ECM_OPTIONAL_ADD_SUBDIRECTORY( <dir> ) +# ECM_OPTIONAL_ADD_SUBDIRECTORY(<dir>) # If you use ECM_OPTIONAL_ADD_SUBDIRECTORY() instead of ADD_SUBDIRECTORY(), # this will have two effects # 1 - CMake will not complain if the directory doesn't exist @@ -22,20 +22,20 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -function(ECM_OPTIONAL_ADD_SUBDIRECTORY _dir ) - get_filename_component(_fullPath ${_dir} ABSOLUTE) - if(EXISTS ${_fullPath}/CMakeLists.txt) - if(DISABLE_ALL_OPTIONAL_SUBDIRECTORIES) - set(_DEFAULT_OPTION_VALUE FALSE) - else() - set(_DEFAULT_OPTION_VALUE TRUE) - endif() - if(DISABLE_ALL_OPTIONAL_SUBDIRS AND NOT DEFINED BUILD_${_dir}) - set(_DEFAULT_OPTION_VALUE FALSE) - endif() - option(BUILD_${_dir} "Build directory ${_dir}" ${_DEFAULT_OPTION_VALUE}) - if(BUILD_${_dir}) - add_subdirectory(${_dir}) - endif() - endif() +function(ECM_OPTIONAL_ADD_SUBDIRECTORY _dir) + get_filename_component(_fullPath ${_dir} ABSOLUTE) + if(EXISTS ${_fullPath}/CMakeLists.txt) + if(DISABLE_ALL_OPTIONAL_SUBDIRECTORIES) + set(_DEFAULT_OPTION_VALUE FALSE) + else() + set(_DEFAULT_OPTION_VALUE TRUE) + endif() + if(DISABLE_ALL_OPTIONAL_SUBDIRS AND NOT DEFINED BUILD_${_dir}) + set(_DEFAULT_OPTION_VALUE FALSE) + endif() + option(BUILD_${_dir} "Build directory ${_dir}" ${_DEFAULT_OPTION_VALUE}) + if(BUILD_${_dir}) + add_subdirectory(${_dir}) + endif() + endif() endfunction() diff --git a/modules/ECMQtFramework.cmake b/modules/ECMQtFramework.cmake index af8fad12..456a5571 100644 --- a/modules/ECMQtFramework.cmake +++ b/modules/ECMQtFramework.cmake @@ -14,8 +14,8 @@ include(GenerateExportHeader) add_compiler_export_flags() # create coverage build type -set(CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} Coverage ) -if (${CMAKE_VERSION} VERSION_GREATER 2.8.2) +set(CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} Coverage) +if(${CMAKE_VERSION} VERSION_GREATER 2.8.2) set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo" "Coverage") endif() @@ -58,10 +58,10 @@ set(CMAKE_AUTOMOC ON) set(LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (eg. '64')") -set(LIB_INSTALL_DIR lib${LIB_SUFFIX} ) -set(BIN_INSTALL_DIR bin ) -set(INCLUDE_INSTALL_DIR include ) -set(DATA_INSTALL_DIR share/apps ) +set(LIB_INSTALL_DIR lib${LIB_SUFFIX}) +set(BIN_INSTALL_DIR bin) +set(INCLUDE_INSTALL_DIR include) +set(DATA_INSTALL_DIR share/apps) set(LIBRARY_TYPE SHARED) @@ -76,9 +76,9 @@ set(ECM_TARGET_DEFAULT_ARGS set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -set(CMAKECONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}" ) +set(CMAKECONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}") -file(RELATIVE_PATH relInstallDir ${CMAKE_INSTALL_PREFIX}/${CMAKECONFIG_INSTALL_DIR} ${CMAKE_INSTALL_PREFIX} ) +file(RELATIVE_PATH relInstallDir ${CMAKE_INSTALL_PREFIX}/${CMAKECONFIG_INSTALL_DIR} ${CMAKE_INSTALL_PREFIX}) configure_file( "${EXTRA_CMAKE_MODULES_MODULE_PATH}/ECMConfig.cmake.in" @@ -86,7 +86,7 @@ configure_file( @ONLY ) -include (WriteBasicConfigVersionFile) +include(WriteBasicConfigVersionFile) write_basic_config_version_file("${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" VERSION ${ECM_VERSION_MAJOR}.${ECM_VERSION_MINOR}.${ECM_VERSION_PATCH} @@ -118,7 +118,7 @@ install(FILES COMPONENT Devel ) -STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER) +string(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER) configure_file( "${EXTRA_CMAKE_MODULES_MODULE_PATH}/ECMVersionHeader.h.in" |