[Cmake-commits] CMake branch, master, updated. v3.9.2-813-gead879d
Kitware Robot
kwrobot at kitware.com
Fri Sep 15 08:45:08 EDT 2017
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 ead879df2067ccada6cc86ed6248bff850f0f6ec (commit)
via 5dc215e03b6a7a421cd024daa8e8747d46b9e60d (commit)
via a8f70b32fbe11dab75580f1310c47a42dae59779 (commit)
via 549366cbfc425cdeb3b84e78ea2f0ca3010c8a2a (commit)
from 6b76615c4e55dc93fbe6880151a4a24ae700987b (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=ead879df2067ccada6cc86ed6248bff850f0f6ec
commit ead879df2067ccada6cc86ed6248bff850f0f6ec
Merge: 6b76615 5dc215e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 15 12:41:58 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Sep 15 08:42:16 2017 -0400
Merge topic 'fphsa-fix-version-exact'
5dc215e0 FPHSA: fix typo in comment
a8f70b32 FPHSA: replace left-over VERSION by _FOUND_VERSION.
549366cb FPHSA: Add (failing) unit test when checking EXACT on full version number
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1259
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5dc215e03b6a7a421cd024daa8e8747d46b9e60d
commit 5dc215e03b6a7a421cd024daa8e8747d46b9e60d
Author: Yves Frederix <yves.frederix at dentsplysirona.com>
AuthorDate: Wed Sep 13 23:00:26 2017 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 14 08:21:38 2017 -0400
FPHSA: fix typo in comment
diff --git a/Tests/RunCMake/FPHSA/RunCMakeTest.cmake b/Tests/RunCMake/FPHSA/RunCMakeTest.cmake
index 2ac309b..dd73cd4 100644
--- a/Tests/RunCMake/FPHSA/RunCMakeTest.cmake
+++ b/Tests/RunCMake/FPHSA/RunCMakeTest.cmake
@@ -9,12 +9,12 @@ run_cmake(BadFoundVar)
set(RunCMake_TEST_OPTIONS "-DCMAKE_MODULE_PATH=${CMAKE_CURRENT_LIST_DIR}" "-DPseudo_VERSION=0")
run_cmake(any_version_find_0)
-# Find a package with more customary version number, without requestion a specific version and in
+# Find a package with more customary version number, without requesting a specific version and in
# the presence of a cache variable VERSION.
set(RunCMake_TEST_OPTIONS "-DCMAKE_MODULE_PATH=${CMAKE_CURRENT_LIST_DIR}" "-DPseudoNoVersionVar_VERSION=1.2.3.4_SHOULD_BE_IGNORED" "-DVERSION=BAD_VERSION")
run_cmake(any_version_VERSION_cache_variable)
-# Find a package with a more customary version number, without requestion a specific version.
+# Find a package with a more customary version number, without requesting a specific version.
set(RunCMake_TEST_OPTIONS "-DCMAKE_MODULE_PATH=${CMAKE_CURRENT_LIST_DIR}" "-DPseudo_VERSION=1.2.3.4")
run_cmake(any_version)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8f70b32fbe11dab75580f1310c47a42dae59779
commit a8f70b32fbe11dab75580f1310c47a42dae59779
Author: Yves Frederix <yves.frederix at dentsplysirona.com>
AuthorDate: Wed Sep 13 21:10:46 2017 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 14 08:21:38 2017 -0400
FPHSA: replace left-over VERSION by _FOUND_VERSION.
This was accidentally left out of commit aec27c152e (FPHSA: use more
localized _FOUND_VERSION instead of VERSION, 2017-09-05).
Fixes: #17281
diff --git a/Modules/FindPackageHandleStandardArgs.cmake b/Modules/FindPackageHandleStandardArgs.cmake
index 7b08bea..67f6bd6 100644
--- a/Modules/FindPackageHandleStandardArgs.cmake
+++ b/Modules/FindPackageHandleStandardArgs.cmake
@@ -322,7 +322,7 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
endif ()
unset(_VERSION_HEAD)
else ()
- if (NOT ${_NAME}_FIND_VERSION VERSION_EQUAL VERSION)
+ if (NOT ${_NAME}_FIND_VERSION VERSION_EQUAL _FOUND_VERSION)
set(VERSION_MSG "Found unsuitable version \"${_FOUND_VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"")
set(VERSION_OK FALSE)
else ()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=549366cbfc425cdeb3b84e78ea2f0ca3010c8a2a
commit 549366cbfc425cdeb3b84e78ea2f0ca3010c8a2a
Author: Yves Frederix <yves.frederix at dentsplysirona.com>
AuthorDate: Wed Sep 13 21:56:25 2017 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 14 08:21:22 2017 -0400
FPHSA: Add (failing) unit test when checking EXACT on full version number
This test detects a regression introduced by commit aec27c152e (FPHSA:
use more localized _FOUND_VERSION instead of VERSION, 2017-09-05).
diff --git a/Tests/RunCMake/FPHSA/RunCMakeTest.cmake b/Tests/RunCMake/FPHSA/RunCMakeTest.cmake
index 1b71a31..2ac309b 100644
--- a/Tests/RunCMake/FPHSA/RunCMakeTest.cmake
+++ b/Tests/RunCMake/FPHSA/RunCMakeTest.cmake
@@ -11,11 +11,11 @@ run_cmake(any_version_find_0)
# Find a package with more customary version number, without requestion a specific version and in
# the presence of a cache variable VERSION.
-set(RunCMake_TEST_OPTIONS "-DCMAKE_MODULE_PATH=${CMAKE_CURRENT_LIST_DIR}" "-DPseudoNoVersionVar_VERSION=1.2.3.4.5_SHOULD_BE_IGNORED" "-DVERSION=BAD_VERSION")
+set(RunCMake_TEST_OPTIONS "-DCMAKE_MODULE_PATH=${CMAKE_CURRENT_LIST_DIR}" "-DPseudoNoVersionVar_VERSION=1.2.3.4_SHOULD_BE_IGNORED" "-DVERSION=BAD_VERSION")
run_cmake(any_version_VERSION_cache_variable)
# Find a package with a more customary version number, without requestion a specific version.
-set(RunCMake_TEST_OPTIONS "-DCMAKE_MODULE_PATH=${CMAKE_CURRENT_LIST_DIR}" "-DPseudo_VERSION=1.2.3.4.5")
+set(RunCMake_TEST_OPTIONS "-DCMAKE_MODULE_PATH=${CMAKE_CURRENT_LIST_DIR}" "-DPseudo_VERSION=1.2.3.4")
run_cmake(any_version)
# test EXACT mode with every subcomponent
-----------------------------------------------------------------------
Summary of changes:
Modules/FindPackageHandleStandardArgs.cmake | 2 +-
Tests/RunCMake/FPHSA/RunCMakeTest.cmake | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list