mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-06 14:19:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cpack-default-package-version-zero' into release-3.12

Browse Source 
Merge-request: !2239
This commit is contained in:
Craig Scott
2018-07-29 19:44:24 +10:00
parent 8442d9fc3f ed015bde2b
commit 2af5307317
8 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/CPack.cmake
+15 -12
View File
@@ -403,28 +403,31 @@ endfunction()
# Set the package name
_cpack_set_default(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
if(CMAKE_PROJECT_VERSION_MAJOR)
# Set the package version
if(CMAKE_PROJECT_VERSION_MAJOR GREATER_EQUAL 0)
_cpack_set_default(CPACK_PACKAGE_VERSION_MAJOR "${CMAKE_PROJECT_VERSION_MAJOR}")
if(CMAKE_PROJECT_VERSION_MINOR)
if(CMAKE_PROJECT_VERSION_MINOR GREATER_EQUAL 0)
_cpack_set_default(CPACK_PACKAGE_VERSION_MINOR "${CMAKE_PROJECT_VERSION_MINOR}")
if(CMAKE_PROJECT_VERSION_PATCH)
if(CMAKE_PROJECT_VERSION_PATCH GREATER_EQUAL 0)
_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()
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}")
endif()
if(NOT DEFINED CPACK_PACKAGE_VERSION)
set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}")
if(CPACK_PACKAGE_VERSION_MINOR GREATER_EQUAL 0)
string(APPEND CPACK_PACKAGE_VERSION ".${CPACK_PACKAGE_VERSION_MINOR}")
if(CPACK_PACKAGE_VERSION_PATCH GREATER_EQUAL 0)
string(APPEND CPACK_PACKAGE_VERSION ".${CPACK_PACKAGE_VERSION_PATCH}")
endif()
endif()
endif()
_cpack_set_default(CPACK_PACKAGE_VENDOR "Humanity")
if(CMAKE_PROJECT_DESCRIPTION)
_cpack_set_default(CPACK_PACKAGE_DESCRIPTION_SUMMARY
Tests/RunCMake/CPackConfig/RunCMakeTest.cmake
+3
View File
@@ -4,3 +4,6 @@ run_cmake(Simple)
run_cmake(Default)
run_cmake(Special)
run_cmake(Verbatim)
run_cmake(Version1)
run_cmake(Version2)
run_cmake(Version3)
Tests/RunCMake/CPackConfig/Version1-check.cmake
+6
View File
@@ -0,0 +1,6 @@
include(${RunCMake_SOURCE_DIR}/check.cmake)
test_variable(CPACK_PACKAGE_VERSION "0")
test_variable(CPACK_PACKAGE_VERSION_MAJOR "0")
test_variable(CPACK_PACKAGE_VERSION_MINOR "")
test_variable(CPACK_PACKAGE_VERSION_PATCH "")
Tests/RunCMake/CPackConfig/Version1.cmake
+1
View File
@@ -0,0 +1 @@
project(Version LANGUAGES NONE VERSION 0)
Tests/RunCMake/CPackConfig/Version2-check.cmake
+6
View File
@@ -0,0 +1,6 @@
include(${RunCMake_SOURCE_DIR}/check.cmake)
test_variable(CPACK_PACKAGE_VERSION "1.0")
test_variable(CPACK_PACKAGE_VERSION_MAJOR "1")
test_variable(CPACK_PACKAGE_VERSION_MINOR "0")
test_variable(CPACK_PACKAGE_VERSION_PATCH "")
Tests/RunCMake/CPackConfig/Version2.cmake
+1
View File
@@ -0,0 +1 @@
project(Version LANGUAGES NONE VERSION 1.0)
Tests/RunCMake/CPackConfig/Version3-check.cmake
+6
View File
@@ -0,0 +1,6 @@
include(${RunCMake_SOURCE_DIR}/check.cmake)
test_variable(CPACK_PACKAGE_VERSION "1.1.0")
test_variable(CPACK_PACKAGE_VERSION_MAJOR "1")
test_variable(CPACK_PACKAGE_VERSION_MINOR "1")
test_variable(CPACK_PACKAGE_VERSION_PATCH "0")
Tests/RunCMake/CPackConfig/Version3.cmake
+1
View File
@@ -0,0 +1 @@
project(Version LANGUAGES NONE VERSION 1.1.0)