diff options
| author | Craig Scott <craig.scott@crascit.com> | 2018-05-06 11:14:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-05-06 11:14:54 (GMT) |
| commit | dfc692342831186053bd385605c8a21239e2e77d (patch) | |
| tree | 457a20c579ea77bdf24b4439816543b5637ff93e | |
| parent | c97189f9d1f98f357be179d7260e3f91431d72e1 (diff) | |
| parent | a01c6e99218540f6e924afd3e855e6db9af76708 (diff) | |
| download | CMake-dfc692342831186053bd385605c8a21239e2e77d.zip CMake-dfc692342831186053bd385605c8a21239e2e77d.tar.gz CMake-dfc692342831186053bd385605c8a21239e2e77d.tar.bz2 | |
Merge topic 'cpack_module_indentation_fix'
a01c6e9921 CPack: Fix indentation
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2041
| -rw-r--r-- | Modules/CPack.cmake | 34 |
1 files changed, 17 insertions, 17 deletions
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) |