[Cmake-commits] CMake branch, master, updated. v3.11.1-706-gdfc6923

[Kitware Robot]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  dfc692342831186053bd385605c8a21239e2e77d (commit)
       via  a01c6e99218540f6e924afd3e855e6db9af76708 (commit)
      from  c97189f9d1f98f357be179d7260e3f91431d72e1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dfc692342831186053bd385605c8a21239e2e77d
commit dfc692342831186053bd385605c8a21239e2e77d
Merge: c97189f a01c6e9
Author:     Craig Scott <craig.scott at crascit.com>
AuthorDate: Sun May 6 11:14:29 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sun May 6 07:14:54 2018 -0400

    Merge topic 'cpack_module_indentation_fix'
    
    a01c6e9921 CPack: Fix indentation
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2041


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a01c6e99218540f6e924afd3e855e6db9af76708
commit a01c6e99218540f6e924afd3e855e6db9af76708
Author:     Craig Scott <craig.scott at crascit.com>
AuthorDate: Sat May 5 09:48:25 2018 +1000
Commit:     Craig Scott <craig.scott at crascit.com>
CommitDate: Sat May 5 09:48:25 2018 +1000

    CPack: Fix indentation
    
    Addresses indentation not matching guidelines, missed in !2020.
    No functional changes and no changes to docs.

diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index 720b972..f6d74c5 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -388,26 +388,26 @@ endfunction()
 # Set the package name
 _cpack_set_default(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
 if(CMAKE_PROJECT_VERSION_MAJOR)
-    _cpack_set_default(CPACK_PACKAGE_VERSION_MAJOR "${CMAKE_PROJECT_VERSION_MAJOR}")
-    if(CMAKE_PROJECT_VERSION_MINOR)
-        _cpack_set_default(CPACK_PACKAGE_VERSION_MINOR "${CMAKE_PROJECT_VERSION_MINOR}")
-        if(CMAKE_PROJECT_VERSION_PATCH)
-            _cpack_set_default(CPACK_PACKAGE_VERSION_PATCH "${CMAKE_PROJECT_VERSION_PATCH}")
-            _cpack_set_default(CPACK_PACKAGE_VERSION
-                "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-        else()
-            _cpack_set_default(CPACK_PACKAGE_VERSION
-            "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
-        endif()
+  _cpack_set_default(CPACK_PACKAGE_VERSION_MAJOR "${CMAKE_PROJECT_VERSION_MAJOR}")
+  if(CMAKE_PROJECT_VERSION_MINOR)
+    _cpack_set_default(CPACK_PACKAGE_VERSION_MINOR "${CMAKE_PROJECT_VERSION_MINOR}")
+    if(CMAKE_PROJECT_VERSION_PATCH)
+      _cpack_set_default(CPACK_PACKAGE_VERSION_PATCH "${CMAKE_PROJECT_VERSION_PATCH}")
+      _cpack_set_default(CPACK_PACKAGE_VERSION
+        "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
     else()
-        _cpack_set_default(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}")
+      _cpack_set_default(CPACK_PACKAGE_VERSION
+      "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
     endif()
+  else()
+    _cpack_set_default(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}")
+  endif()
 else()
-    _cpack_set_default(CPACK_PACKAGE_VERSION_MAJOR "0")
-    _cpack_set_default(CPACK_PACKAGE_VERSION_MINOR "1")
-    _cpack_set_default(CPACK_PACKAGE_VERSION_PATCH "1")
-    _cpack_set_default(CPACK_PACKAGE_VERSION
-        "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+  _cpack_set_default(CPACK_PACKAGE_VERSION_MAJOR "0")
+  _cpack_set_default(CPACK_PACKAGE_VERSION_MINOR "1")
+  _cpack_set_default(CPACK_PACKAGE_VERSION_PATCH "1")
+  _cpack_set_default(CPACK_PACKAGE_VERSION
+    "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 endif()
 _cpack_set_default(CPACK_PACKAGE_VENDOR "Humanity")
 if(CMAKE_PROJECT_DESCRIPTION)

-----------------------------------------------------------------------

Summary of changes:
 Modules/CPack.cmake |   34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
CMake