[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [extra-cmake-modules] /: cleanup per cmakelint.py
From:       Allen Winter <allen.winter () kdab ! com>
Date:       2011-09-17 17:35:28
Message-ID: 20110917173528.569EEA607A () git ! kde ! org
[Download RAW message or body]

Git commit 5c8d7e3bbca29dc0a7e7a220fcb0d1de440d15fe by Allen Winter.
Committed on 17/09/2011 at 19:35.
Pushed by winterz into branch 'master'.

cleanup per cmakelint.py

M  +22   -21   CMakeLists.txt
M  +8    -8    extra-cmake-modules-config-version.cmake.in
M  +1    -1    extra-cmake-modules-config.cmake.in

http://commits.kde.org/extra-cmake-modules/5c8d7e3bbca29dc0a7e7a220fcb0d1de440d15fe

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80306e0..202fcc9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,51 +1,52 @@
-cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR ) # this will be upgraded to 2.8.6
+cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR) # this will be upgraded to 2.8.6
 
 project(extra-cmake-modules)
 
-set(ECM_MAJOR_VERSION 0 )
-set(ECM_MINOR_VERSION 0 )
-set(ECM_PATCH_VERSION 1 )
+set(ECM_MAJOR_VERSION 0)
+set(ECM_MINOR_VERSION 0)
+set(ECM_PATCH_VERSION 1)
 
-set(ECM_VERSION ${ECM_MAJOR_VERSION}.${ECM_MINOR_VERSION}.${ECM_PATCH_VERSION} )
+set(ECM_VERSION ${ECM_MAJOR_VERSION}.${ECM_MINOR_VERSION}.${ECM_PATCH_VERSION})
 
-set(SHARE_INSTALL_DIR share/extra-cmake-modules-${ECM_VERSION} )
-set(MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/modules/ )
-set(CMAKECONFIG_INSTALL_DIR ${SHARE_INSTALL_DIR}/cmake/ )
-set(DOC_INSTALL_DIR ${SHARE_INSTALL_DIR}/doc/ )
+set(SHARE_INSTALL_DIR share/extra-cmake-modules-${ECM_VERSION})
+set(MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/modules/)
+set(CMAKECONFIG_INSTALL_DIR ${SHARE_INSTALL_DIR}/cmake/)
+set(DOC_INSTALL_DIR ${SHARE_INSTALL_DIR}/doc/)
 
 # create and install docs
-add_custom_target(ManPage ALL
-                  COMMAND ${CMAKE_COMMAND} \
-DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/modules --help-custom-modules \
                "${CMAKE_BINARY_DIR}/extra-cmake-modules.1"
-                  COMMAND ${CMAKE_COMMAND} \
-DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/modules --help-custom-modules \
                "${CMAKE_BINARY_DIR}/extra-cmake-modules.html"
-                  COMMAND ${CMAKE_COMMAND} \
-DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/modules --help-custom-modules \
                "${CMAKE_BINARY_DIR}/extra-cmake-modules.txt"
-                 )
+add_custom_target(
+  ManPage ALL
+  COMMAND ${CMAKE_COMMAND} -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/modules \
--help-custom-modules "${CMAKE_BINARY_DIR}/extra-cmake-modules.1" +  COMMAND \
${CMAKE_COMMAND} -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/modules \
--help-custom-modules "${CMAKE_BINARY_DIR}/extra-cmake-modules.html" +  COMMAND \
${CMAKE_COMMAND} -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/modules \
--help-custom-modules "${CMAKE_BINARY_DIR}/extra-cmake-modules.txt" +)
 
-install(FILES "${CMAKE_BINARY_DIR}/extra-cmake-modules.1" DESTINATION man/man1/ )
+install(FILES "${CMAKE_BINARY_DIR}/extra-cmake-modules.1" DESTINATION man/man1/)
 
 install(FILES "${CMAKE_BINARY_DIR}/extra-cmake-modules.txt" \
                "${CMAKE_BINARY_DIR}/extra-cmake-modules.html"
-        DESTINATION ${DOC_INSTALL_DIR} )
+        DESTINATION ${DOC_INSTALL_DIR})
 
 
-file(GLOB installFiles ${CMAKE_SOURCE_DIR}/modules/*[^~] )
+file(GLOB installFiles ${CMAKE_SOURCE_DIR}/modules/*[^~])
 
-install(FILES ${installFiles} DESTINATION ${MODULES_INSTALL_DIR} )
+install(FILES ${installFiles} DESTINATION ${MODULES_INSTALL_DIR})
 
 # figure out the relative path from the installed Config.cmake file to the install \
prefix (which may be at  # runtime different from the chosen CMAKE_INSTALL_PREFIX if \
under Windows the package was installed anywhere)  # This relative path will be \
                configured into the BarConfig.cmake
-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-config.cmake.in \
${CMAKE_CURRENT_BINARY_DIR}/extra-cmake-modules-config.cmake @ONLY)  \
configure_file(extra-cmake-modules-config-version.cmake.in \
${CMAKE_CURRENT_BINARY_DIR}/extra-cmake-modules-config-version.cmake @ONLY)  
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/extra-cmake-modules-config.cmake
               ${CMAKE_CURRENT_BINARY_DIR}/extra-cmake-modules-config-version.cmake
-        DESTINATION ${CMAKECONFIG_INSTALL_DIR} )
+        DESTINATION ${CMAKECONFIG_INSTALL_DIR})
 
 # need to install a Config.cmake file
 
 # set up packaging
-set(CPACK_PACKAGE_NAME extra-cmake-modules )
+set(CPACK_PACKAGE_NAME extra-cmake-modules)
 set(CPACK_PACKAGE_VERSION ${ECM_VERSION})
 set(CPACK_SYSTEM_NAME "generic")
 set(CPACK_GENERATOR "TGZ")
diff --git a/extra-cmake-modules-config-version.cmake.in \
b/extra-cmake-modules-config-version.cmake.in index ad0bdab..3117aea 100644
--- a/extra-cmake-modules-config-version.cmake.in
+++ b/extra-cmake-modules-config-version.cmake.in
@@ -14,11 +14,11 @@
 
 set(PACKAGE_VERSION @ECM_MAJOR_VERSION@.@ECM_MINOR_VERSION@.@ECM_PATCH_VERSION@)
 
-if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
-   set(PACKAGE_VERSION_COMPATIBLE FALSE)
-else("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
-   set(PACKAGE_VERSION_COMPATIBLE TRUE)
-   if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
-      set(PACKAGE_VERSION_EXACT TRUE)
-   endif( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
-endif("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+  set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  if("${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
+    set(PACKAGE_VERSION_EXACT TRUE)
+  endif()
+endif()
diff --git a/extra-cmake-modules-config.cmake.in \
b/extra-cmake-modules-config.cmake.in index e3b2999..22e9eb6 100644
--- a/extra-cmake-modules-config.cmake.in
+++ b/extra-cmake-modules-config.cmake.in
@@ -4,6 +4,6 @@ get_filename_component(rootDir \
${CMAKE_CURRENT_LIST_DIR}/@relInstallDir@ ABSOLUT  \
set(EXTRA_CMAKE_MODULES_VERSION_MAJOR @ECM_MAJOR_VERSION@)  \
set(EXTRA_CMAKE_MODULES_VERSION_MINOR @ECM_MINOR_VERSION@)  \
                set(EXTRA_CMAKE_MODULES_VERSION_PATCH @ECM_PATCH_VERSION@)
-set(EXTRA_CMAKE_MODULES_VERSION \
${EXTRA_CMAKE_MODULES_VERSION_MAJOR}.${EXTRA_CMAKE_MODULES_VERSION_MINOR}.${EXTRA_CMAKE_MODULES_VERSION_PATCH} \
) +set(EXTRA_CMAKE_MODULES_VERSION \
${EXTRA_CMAKE_MODULES_VERSION_MAJOR}.${EXTRA_CMAKE_MODULES_VERSION_MINOR}.${EXTRA_CMAKE_MODULES_VERSION_PATCH})
  
 set(EXTRA_CMAKE_MODULES_MODULE_PATH "${rootDir}/@MODULES_INSTALL_DIR@")


[prev in list] [next in list] [prev in thread] [next in thread]