diff options
| author | Craig Scott <craig.scott@crascit.com> | 2018-07-29 09:40:31 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-07-29 09:40:37 (GMT) |
| commit | 50e40b7eecf2ca9aca73b6a907227e8191fffe56 (patch) | |
| tree | ddcfdfe660cab0410fe3591c0ec3b6b8c8ef6263 /Tests | |
| parent | 7a7e4e9ea323839263dc75cb87e80502a5447d7f (diff) | |
| parent | ed015bde2b6fe526f5f840f43c1c12ba45d5663f (diff) | |
| download | CMake-50e40b7eecf2ca9aca73b6a907227e8191fffe56.zip CMake-50e40b7eecf2ca9aca73b6a907227e8191fffe56.tar.gz CMake-50e40b7eecf2ca9aca73b6a907227e8191fffe56.tar.bz2 | |
Merge topic 'cpack-default-package-version-zero'
ed015bde2b CPack: Restore support for 0-valued version components
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2239
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/CPackConfig/RunCMakeTest.cmake | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/CPackConfig/Version1-check.cmake | 6 | ||||
| -rw-r--r-- | Tests/RunCMake/CPackConfig/Version1.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/CPackConfig/Version2-check.cmake | 6 | ||||
| -rw-r--r-- | Tests/RunCMake/CPackConfig/Version2.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/CPackConfig/Version3-check.cmake | 6 | ||||
| -rw-r--r-- | Tests/RunCMake/CPackConfig/Version3.cmake | 1 |
7 files changed, 24 insertions, 0 deletions
diff --git a/Tests/RunCMake/CPackConfig/RunCMakeTest.cmake b/Tests/RunCMake/CPackConfig/RunCMakeTest.cmake index 16d2cf3..8f2196d 100644 --- a/Tests/RunCMake/CPackConfig/RunCMakeTest.cmake +++ b/Tests/RunCMake/CPackConfig/RunCMakeTest.cmake @@ -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) diff --git a/Tests/RunCMake/CPackConfig/Version1-check.cmake b/Tests/RunCMake/CPackConfig/Version1-check.cmake new file mode 100644 index 0000000..0f5347f --- /dev/null +++ b/Tests/RunCMake/CPackConfig/Version1-check.cmake @@ -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 "") diff --git a/Tests/RunCMake/CPackConfig/Version1.cmake b/Tests/RunCMake/CPackConfig/Version1.cmake new file mode 100644 index 0000000..703485c --- /dev/null +++ b/Tests/RunCMake/CPackConfig/Version1.cmake @@ -0,0 +1 @@ +project(Version LANGUAGES NONE VERSION 0) diff --git a/Tests/RunCMake/CPackConfig/Version2-check.cmake b/Tests/RunCMake/CPackConfig/Version2-check.cmake new file mode 100644 index 0000000..3a2d572 --- /dev/null +++ b/Tests/RunCMake/CPackConfig/Version2-check.cmake @@ -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 "") diff --git a/Tests/RunCMake/CPackConfig/Version2.cmake b/Tests/RunCMake/CPackConfig/Version2.cmake new file mode 100644 index 0000000..c084137 --- /dev/null +++ b/Tests/RunCMake/CPackConfig/Version2.cmake @@ -0,0 +1 @@ +project(Version LANGUAGES NONE VERSION 1.0) diff --git a/Tests/RunCMake/CPackConfig/Version3-check.cmake b/Tests/RunCMake/CPackConfig/Version3-check.cmake new file mode 100644 index 0000000..d4a3983 --- /dev/null +++ b/Tests/RunCMake/CPackConfig/Version3-check.cmake @@ -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") diff --git a/Tests/RunCMake/CPackConfig/Version3.cmake b/Tests/RunCMake/CPackConfig/Version3.cmake new file mode 100644 index 0000000..4df28bb --- /dev/null +++ b/Tests/RunCMake/CPackConfig/Version3.cmake @@ -0,0 +1 @@ +project(Version LANGUAGES NONE VERSION 1.1.0) |