[Cmake-commits] CMake branch, next, updated. v3.0.2-5666-g7da8f2d
Rolf Eike Beer
eike at sf-mail.de
Tue Oct 7 17:14:33 EDT 2014
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, next has been updated
via 7da8f2dea8c8d25899590d7944af0231bd2d3a30 (commit)
via f7b6fc6c9801ae8a56ade29afd5058724469a0ce (commit)
via d808b4fb643fb489cfec5c8e505f8f58021f040c (commit)
from 2a0e90aea088e66107c71e7d74ad0802c0b3d9fd (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7da8f2dea8c8d25899590d7944af0231bd2d3a30
commit 7da8f2dea8c8d25899590d7944af0231bd2d3a30
Merge: 2a0e90a f7b6fc6
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Oct 7 17:14:31 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 7 17:14:31 2014 -0400
Merge topic 'FPHSA_exact_version' into next
f7b6fc6c FPHSA: fix when requested or found version is exactly 0
d808b4fb Tests: check FPHSA version selection
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7b6fc6c9801ae8a56ade29afd5058724469a0ce
commit f7b6fc6c9801ae8a56ade29afd5058724469a0ce
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Oct 7 22:46:11 2014 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Oct 7 23:14:00 2014 +0200
FPHSA: fix when requested or found version is exactly 0
Until now it was checked with "if(VAR)", which will be false in case "0" is the
content of the variable.
diff --git a/Modules/FindPackageHandleStandardArgs.cmake b/Modules/FindPackageHandleStandardArgs.cmake
index f6e536b..23f3f05 100644
--- a/Modules/FindPackageHandleStandardArgs.cmake
+++ b/Modules/FindPackageHandleStandardArgs.cmake
@@ -284,10 +284,11 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
# version handling:
set(VERSION_MSG "")
set(VERSION_OK TRUE)
- set(VERSION ${${FPHSA_VERSION_VAR}} )
- if (${_NAME}_FIND_VERSION)
+ set(VERSION ${${FPHSA_VERSION_VAR}})
- if(VERSION)
+ # check with DEFINED here as the requested or found version may be "0"
+ if (DEFINED ${_NAME}_FIND_VERSION)
+ if(DEFINED ${FPHSA_VERSION_VAR})
if(${_NAME}_FIND_VERSION_EXACT) # exact version required
# count the dots in the version string
diff --git a/Tests/RunCMake/FPHSA/RunCMakeTest.cmake b/Tests/RunCMake/FPHSA/RunCMakeTest.cmake
index 37c18d0..bb7743c 100644
--- a/Tests/RunCMake/FPHSA/RunCMakeTest.cmake
+++ b/Tests/RunCMake/FPHSA/RunCMakeTest.cmake
@@ -14,6 +14,7 @@ run_cmake(exact_1.2.3)
run_cmake(exact_1.2.3.4)
# now test every component with an invalid version
+run_cmake(exact_0)
run_cmake(exact_2)
run_cmake(exact_1.1)
run_cmake(exact_1.3)
@@ -21,3 +22,7 @@ run_cmake(exact_1.2.2)
run_cmake(exact_1.2.4)
run_cmake(exact_1.2.3.3)
run_cmake(exact_1.2.3.5)
+
+# check if searching for a version 0 works
+list(APPEND RunCMake_TEST_OPTIONS "-DCMAKE_MODULE_PATH=${CMAKE_CURRENT_LIST_DIR}" "-DPseudo_VERSION=0")
+run_cmake(exact_0_matching)
diff --git a/Tests/RunCMake/FPHSA/exact_0-result.txt b/Tests/RunCMake/FPHSA/exact_0-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/exact_0-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/FPHSA/exact_0.cmake b/Tests/RunCMake/FPHSA/exact_0.cmake
new file mode 100644
index 0000000..432887b
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/exact_0.cmake
@@ -0,0 +1 @@
+find_package(Pseudo 0 EXACT REQUIRED)
diff --git a/Tests/RunCMake/FPHSA/exact_0_matching.cmake b/Tests/RunCMake/FPHSA/exact_0_matching.cmake
new file mode 100644
index 0000000..432887b
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/exact_0_matching.cmake
@@ -0,0 +1 @@
+find_package(Pseudo 0 EXACT REQUIRED)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d808b4fb643fb489cfec5c8e505f8f58021f040c
commit d808b4fb643fb489cfec5c8e505f8f58021f040c
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Oct 7 22:47:40 2014 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Oct 7 23:13:25 2014 +0200
Tests: check FPHSA version selection
diff --git a/Tests/RunCMake/FPHSA/FindPseudo.cmake b/Tests/RunCMake/FPHSA/FindPseudo.cmake
new file mode 100644
index 0000000..dc3558b
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/FindPseudo.cmake
@@ -0,0 +1,6 @@
+# pseudo find_module
+
+set(FOOBAR TRUE)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Pseudo REQUIRED_VARS FOOBAR VERSION_VAR Pseudo_VERSION)
diff --git a/Tests/RunCMake/FPHSA/RunCMakeTest.cmake b/Tests/RunCMake/FPHSA/RunCMakeTest.cmake
index 0d48fa9..37c18d0 100644
--- a/Tests/RunCMake/FPHSA/RunCMakeTest.cmake
+++ b/Tests/RunCMake/FPHSA/RunCMakeTest.cmake
@@ -1,3 +1,23 @@
include(RunCMake)
run_cmake(BadFoundVar)
+
+# The pseudo module will "find" a package with the given version. Check if the
+# version selection code in FPHSA works correctly.
+set(RunCMake_TEST_OPTIONS "-DCMAKE_MODULE_PATH=${CMAKE_CURRENT_LIST_DIR}" "-DPseudo_VERSION=1.2.3.4.5")
+run_cmake(any_version)
+
+# test EXACT mode with every subcomponent
+run_cmake(exact_1)
+run_cmake(exact_1.2)
+run_cmake(exact_1.2.3)
+run_cmake(exact_1.2.3.4)
+
+# now test every component with an invalid version
+run_cmake(exact_2)
+run_cmake(exact_1.1)
+run_cmake(exact_1.3)
+run_cmake(exact_1.2.2)
+run_cmake(exact_1.2.4)
+run_cmake(exact_1.2.3.3)
+run_cmake(exact_1.2.3.5)
diff --git a/Tests/RunCMake/FPHSA/any_version.cmake b/Tests/RunCMake/FPHSA/any_version.cmake
new file mode 100644
index 0000000..b34a540
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/any_version.cmake
@@ -0,0 +1 @@
+find_package(Pseudo REQUIRED)
diff --git a/Tests/RunCMake/FPHSA/exact_1.1-result.txt b/Tests/RunCMake/FPHSA/exact_1.1-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/exact_1.1-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/FPHSA/exact_1.1.cmake b/Tests/RunCMake/FPHSA/exact_1.1.cmake
new file mode 100644
index 0000000..d967da9
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/exact_1.1.cmake
@@ -0,0 +1 @@
+find_package(Pseudo 1.1 EXACT REQUIRED)
diff --git a/Tests/RunCMake/FPHSA/exact_1.2.2-result.txt b/Tests/RunCMake/FPHSA/exact_1.2.2-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/exact_1.2.2-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/FPHSA/exact_1.2.2.cmake b/Tests/RunCMake/FPHSA/exact_1.2.2.cmake
new file mode 100644
index 0000000..e959f61
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/exact_1.2.2.cmake
@@ -0,0 +1 @@
+find_package(Pseudo 1.2.2 EXACT REQUIRED)
diff --git a/Tests/RunCMake/FPHSA/exact_1.2.3.3-result.txt b/Tests/RunCMake/FPHSA/exact_1.2.3.3-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/exact_1.2.3.3-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/FPHSA/exact_1.2.3.3.cmake b/Tests/RunCMake/FPHSA/exact_1.2.3.3.cmake
new file mode 100644
index 0000000..af53cc8
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/exact_1.2.3.3.cmake
@@ -0,0 +1 @@
+find_package(Pseudo 1.2.3.3 EXACT REQUIRED)
diff --git a/Tests/RunCMake/FPHSA/exact_1.2.3.4.cmake b/Tests/RunCMake/FPHSA/exact_1.2.3.4.cmake
new file mode 100644
index 0000000..1e2baa6
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/exact_1.2.3.4.cmake
@@ -0,0 +1 @@
+find_package(Pseudo 1.2.3.4 EXACT REQUIRED)
diff --git a/Tests/RunCMake/FPHSA/exact_1.2.3.5-result.txt b/Tests/RunCMake/FPHSA/exact_1.2.3.5-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/exact_1.2.3.5-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/FPHSA/exact_1.2.3.5.cmake b/Tests/RunCMake/FPHSA/exact_1.2.3.5.cmake
new file mode 100644
index 0000000..ddb0d13
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/exact_1.2.3.5.cmake
@@ -0,0 +1 @@
+find_package(Pseudo 1.2.3.5 EXACT REQUIRED)
diff --git a/Tests/RunCMake/FPHSA/exact_1.2.3.cmake b/Tests/RunCMake/FPHSA/exact_1.2.3.cmake
new file mode 100644
index 0000000..bf9b2a3
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/exact_1.2.3.cmake
@@ -0,0 +1 @@
+find_package(Pseudo 1.2.3 EXACT REQUIRED)
diff --git a/Tests/RunCMake/FPHSA/exact_1.2.4-result.txt b/Tests/RunCMake/FPHSA/exact_1.2.4-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/exact_1.2.4-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/FPHSA/exact_1.2.4.cmake b/Tests/RunCMake/FPHSA/exact_1.2.4.cmake
new file mode 100644
index 0000000..548a079
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/exact_1.2.4.cmake
@@ -0,0 +1 @@
+find_package(Pseudo 1.2.4 EXACT REQUIRED)
diff --git a/Tests/RunCMake/FPHSA/exact_1.2.cmake b/Tests/RunCMake/FPHSA/exact_1.2.cmake
new file mode 100644
index 0000000..080d961
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/exact_1.2.cmake
@@ -0,0 +1 @@
+find_package(Pseudo 1.2 EXACT REQUIRED)
diff --git a/Tests/RunCMake/FPHSA/exact_1.3-result.txt b/Tests/RunCMake/FPHSA/exact_1.3-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/exact_1.3-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/FPHSA/exact_1.3.cmake b/Tests/RunCMake/FPHSA/exact_1.3.cmake
new file mode 100644
index 0000000..e36b0c5
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/exact_1.3.cmake
@@ -0,0 +1 @@
+find_package(Pseudo 1.3 EXACT REQUIRED)
diff --git a/Tests/RunCMake/FPHSA/exact_1.cmake b/Tests/RunCMake/FPHSA/exact_1.cmake
new file mode 100644
index 0000000..adadbc4
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/exact_1.cmake
@@ -0,0 +1 @@
+find_package(Pseudo 1 EXACT REQUIRED)
diff --git a/Tests/RunCMake/FPHSA/exact_2-result.txt b/Tests/RunCMake/FPHSA/exact_2-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/exact_2-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/FPHSA/exact_2.cmake b/Tests/RunCMake/FPHSA/exact_2.cmake
new file mode 100644
index 0000000..55353a8
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/exact_2.cmake
@@ -0,0 +1 @@
+find_package(Pseudo 2 EXACT REQUIRED)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindPackageHandleStandardArgs.cmake | 7 +++---
Tests/RunCMake/FPHSA/FindPseudo.cmake | 6 +++++
Tests/RunCMake/FPHSA/RunCMakeTest.cmake | 25 ++++++++++++++++++++
Tests/RunCMake/FPHSA/any_version.cmake | 1 +
.../exact_0-result.txt} | 0
Tests/RunCMake/FPHSA/exact_0.cmake | 1 +
Tests/RunCMake/FPHSA/exact_0_matching.cmake | 1 +
.../exact_1.1-result.txt} | 0
Tests/RunCMake/FPHSA/exact_1.1.cmake | 1 +
.../exact_1.2.2-result.txt} | 0
Tests/RunCMake/FPHSA/exact_1.2.2.cmake | 1 +
.../exact_1.2.3.3-result.txt} | 0
Tests/RunCMake/FPHSA/exact_1.2.3.3.cmake | 1 +
Tests/RunCMake/FPHSA/exact_1.2.3.4.cmake | 1 +
.../exact_1.2.3.5-result.txt} | 0
Tests/RunCMake/FPHSA/exact_1.2.3.5.cmake | 1 +
Tests/RunCMake/FPHSA/exact_1.2.3.cmake | 1 +
.../exact_1.2.4-result.txt} | 0
Tests/RunCMake/FPHSA/exact_1.2.4.cmake | 1 +
Tests/RunCMake/FPHSA/exact_1.2.cmake | 1 +
.../exact_1.3-result.txt} | 0
Tests/RunCMake/FPHSA/exact_1.3.cmake | 1 +
Tests/RunCMake/FPHSA/exact_1.cmake | 1 +
.../exact_2-result.txt} | 0
Tests/RunCMake/FPHSA/exact_2.cmake | 1 +
25 files changed, 49 insertions(+), 3 deletions(-)
create mode 100644 Tests/RunCMake/FPHSA/FindPseudo.cmake
create mode 100644 Tests/RunCMake/FPHSA/any_version.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => FPHSA/exact_0-result.txt} (100%)
create mode 100644 Tests/RunCMake/FPHSA/exact_0.cmake
create mode 100644 Tests/RunCMake/FPHSA/exact_0_matching.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => FPHSA/exact_1.1-result.txt} (100%)
create mode 100644 Tests/RunCMake/FPHSA/exact_1.1.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => FPHSA/exact_1.2.2-result.txt} (100%)
create mode 100644 Tests/RunCMake/FPHSA/exact_1.2.2.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => FPHSA/exact_1.2.3.3-result.txt} (100%)
create mode 100644 Tests/RunCMake/FPHSA/exact_1.2.3.3.cmake
create mode 100644 Tests/RunCMake/FPHSA/exact_1.2.3.4.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => FPHSA/exact_1.2.3.5-result.txt} (100%)
create mode 100644 Tests/RunCMake/FPHSA/exact_1.2.3.5.cmake
create mode 100644 Tests/RunCMake/FPHSA/exact_1.2.3.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => FPHSA/exact_1.2.4-result.txt} (100%)
create mode 100644 Tests/RunCMake/FPHSA/exact_1.2.4.cmake
create mode 100644 Tests/RunCMake/FPHSA/exact_1.2.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => FPHSA/exact_1.3-result.txt} (100%)
create mode 100644 Tests/RunCMake/FPHSA/exact_1.3.cmake
create mode 100644 Tests/RunCMake/FPHSA/exact_1.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => FPHSA/exact_2-result.txt} (100%)
create mode 100644 Tests/RunCMake/FPHSA/exact_2.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list