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 5acb1b2c0191df17c7f2e8fdc96c2e6956d81a71 (commit)
via fa7d47ac5ce8a2c1006fa73f518a33bab9d83174 (commit)
via 3b5ea54a27bc69cf64c87dd5dc2bdc227dc4e776 (commit)
from 8b75f1e2b5b7419d6e1b830a87ef336adb755091 (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=5acb1b2c0191df17c7f2e8fdc96c2e6956d81a71
commit 5acb1b2c0191df17c7f2e8fdc96c2e6956d81a71
Merge: 8b75f1e fa7d47a
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Sep 16 09:13:33 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Sep 16 09:13:33 2014 -0400
Merge topic 'self-CMP0054-cleanup' into next
fa7d47ac Tests: Fix CMP0054 warnings
3b5ea54a CheckPrototypeDefinition: Avoid if() auto-dereference
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa7d47ac5ce8a2c1006fa73f518a33bab9d83174
commit fa7d47ac5ce8a2c1006fa73f518a33bab9d83174
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Sep 16 09:05:22 2014 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Sep 16 09:06:29 2014 -0400
Tests: Fix CMP0054 warnings
Hack the CMP0054 warning locally to be an error and run the test suite.
Resolve CMP0054 in Tests/* code as appropriate for each case.
diff --git a/Tests/CMakeOnly/MajorVersionSelection/CMakeLists.txt
b/Tests/CMakeOnly/MajorVersionSelection/CMakeLists.txt
index 74f5451..2511064 100644
--- a/Tests/CMakeOnly/MajorVersionSelection/CMakeLists.txt
+++ b/Tests/CMakeOnly/MajorVersionSelection/CMakeLists.txt
@@ -20,13 +20,13 @@ endif ()
string(TOUPPER "${MAJOR_TEST_MODULE}" MODULE_UPPER)
-if ( ( ${MAJOR_TEST_MODULE}_FOUND OR ${MODULE_UPPER}_FOUND ) AND
"${VERSION_VAR}")
+if ( ( ${MAJOR_TEST_MODULE}_FOUND OR ${MODULE_UPPER}_FOUND ) AND
${VERSION_VAR})
message(STATUS "${VERSION_VAR} is '${${VERSION_VAR}}'")
- if ("${VERSION_VAR}" VERSION_LESS MAJOR_TEST_VERSION)
+ if (${VERSION_VAR} VERSION_LESS MAJOR_TEST_VERSION)
message(SEND_ERROR "Found version ${${VERSION_VAR}} is less than requested
major version ${MAJOR_TEST_VERSION}")
endif ()
math(EXPR V_PLUS_ONE "${MAJOR_TEST_VERSION} + 1")
- if ("${VERSION_VAR}" VERSION_GREATER V_PLUS_ONE)
+ if (${VERSION_VAR} VERSION_GREATER V_PLUS_ONE)
message(SEND_ERROR "Found version ${${VERSION_VAR}} is greater than
requested major version ${MAJOR_TEST_VERSION}")
endif ()
endif ()
diff --git a/Tests/FunctionTest/CMakeLists.txt
b/Tests/FunctionTest/CMakeLists.txt
index d1fada4..68da972 100644
--- a/Tests/FunctionTest/CMakeLists.txt
+++ b/Tests/FunctionTest/CMakeLists.txt
@@ -92,7 +92,7 @@ endfunction()
STRANGE_FUNCTION(var)
set(second_var "second_var")
-if("${var}" STREQUAL "strange_function" AND "${second_var}" STREQUAL
"second_var")
+if("x${var}" STREQUAL "xstrange_function" AND "x${second_var}" STREQUAL
"xsecond_var")
PASS("Case Test" "(${var} ${second_var})")
else()
FAILED("Case test" "(${var} ${second_var})")
diff --git a/Tests/MacroTest/CMakeLists.txt b/Tests/MacroTest/CMakeLists.txt
index 02bb31f..6c6dfb6 100644
--- a/Tests/MacroTest/CMakeLists.txt
+++ b/Tests/MacroTest/CMakeLists.txt
@@ -36,7 +36,7 @@ macro(strange_macro m)
endmacro()
STRANGE_MACRO(var)
set(second_var "second_var")
-if("${var}" STREQUAL "strange_macro" AND "${second_var}" STREQUAL "second_var")
+if("x${var}" STREQUAL "xstrange_macro" AND "x${second_var}" STREQUAL
"xsecond_var")
PASS("Case Test" "(${var} ${second_var})")
else()
FAILED("Case test" "(${var} ${second_var})")
diff --git a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_NO_PKGCONFIG_PATH.cmake
b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_NO_PKGCONFIG_PATH.cmake
index 924976e..89ce4c6 100644
--- a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_NO_PKGCONFIG_PATH.cmake
+++ b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_NO_PKGCONFIG_PATH.cmake
@@ -26,7 +26,7 @@ endif()
pkg_check_modules(FOO "${expected_path}")
-if(NOT "FOO_FOUND")
+if(NOT FOO_FOUND)
message(FATAL_ERROR "Expected PKG_CONFIG_PATH: \"${expected_path}\".")
endif()
@@ -36,6 +36,6 @@ set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE)
pkg_check_modules(BAR "${expected_path}" NO_CMAKE_PATH
NO_CMAKE_ENVIRONMENT_PATH)
-if(NOT "BAR_FOUND")
+if(NOT BAR_FOUND)
message(FATAL_ERROR "Expected PKG_CONFIG_PATH: \"${expected_path}\".")
endif()
diff --git a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
index 4a66e85..c903279 100644
--- a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
+++ b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
@@ -46,6 +46,6 @@ endif()
pkg_check_modules(FOO "${expected_path}")
-if(NOT "FOO_FOUND")
+if(NOT FOO_FOUND)
message(FATAL_ERROR "Expected PKG_CONFIG_PATH: \"${expected_path}\".")
endif()
diff --git
a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_ENVIRONMENT_PATH.cmake
b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_ENVIRONMENT_PATH.cmake
index 0b057b8..a52bcbf 100644
---
a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_ENVIRONMENT_PATH.cmake
+++
b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_ENVIRONMENT_PATH.cmake
@@ -46,6 +46,6 @@ endif()
pkg_check_modules(FOO "${expected_path}" NO_CMAKE_ENVIRONMENT_PATH)
-if(NOT "FOO_FOUND")
+if(NOT FOO_FOUND)
message(FATAL_ERROR "Expected PKG_CONFIG_PATH: \"${expected_path}\".")
endif()
diff --git
a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_PATH.cmake
b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_PATH.cmake
index a3154f1..2fabe5b 100644
---
a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_PATH.cmake
+++
b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_PATH.cmake
@@ -46,6 +46,6 @@ endif()
pkg_check_modules(FOO "${expected_path}" NO_CMAKE_PATH)
-if(NOT "FOO_FOUND")
+if(NOT FOO_FOUND)
message(FATAL_ERROR "Expected PKG_CONFIG_PATH: \"${expected_path}\".")
endif()
diff --git a/Tests/StringFileTest/CMakeLists.txt
b/Tests/StringFileTest/CMakeLists.txt
index 683f969..e6c6152 100644
--- a/Tests/StringFileTest/CMakeLists.txt
+++ b/Tests/StringFileTest/CMakeLists.txt
@@ -123,7 +123,7 @@ string(STRIP "ST2 " ST2)
string(STRIP " ST3" ST3)
foreach(var ST1 ST2 ST3)
- if("${var}" STREQUAL "${${var}}")
+ if("x${var}" STREQUAL "x${${var}}")
message("[${var}] == [${${var}}]")
else()
message(SEND_ERROR "Problem with the STRIP command for ${var}:
[${${var}}]")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b5ea54a27bc69cf64c87dd5dc2bdc227dc4e776
commit 3b5ea54a27bc69cf64c87dd5dc2bdc227dc4e776
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Sep 16 09:04:20 2014 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Sep 16 09:04:20 2014 -0400
CheckPrototypeDefinition: Avoid if() auto-dereference
Convert from the old if(MATCHES) hack to if(DEFINED) to check whether
the result variable is already set.
diff --git a/Modules/CheckPrototypeDefinition.cmake
b/Modules/CheckPrototypeDefinition.cmake
index dfa54d8..e203d4c 100644
--- a/Modules/CheckPrototypeDefinition.cmake
+++ b/Modules/CheckPrototypeDefinition.cmake
@@ -57,7 +57,7 @@ get_filename_component(__check_proto_def_dir
"${CMAKE_CURRENT_LIST_FILE}" PATH)
function(CHECK_PROTOTYPE_DEFINITION _FUNCTION _PROTOTYPE _RETURN _HEADER
_VARIABLE)
- if ("${_VARIABLE}" MATCHES "^${_VARIABLE}$")
+ if (NOT DEFINED ${_VARIABLE})
set(CHECK_PROTOTYPE_DEFINITION_CONTENT "/* */\n")
set(CHECK_PROTOTYPE_DEFINITION_FLAGS ${CMAKE_REQUIRED_FLAGS})
-----------------------------------------------------------------------
Summary of changes:
Modules/CheckPrototypeDefinition.cmake | 2 +-
Tests/CMakeOnly/MajorVersionSelection/CMakeLists.txt | 6 +++---
Tests/FunctionTest/CMakeLists.txt | 2 +-
Tests/MacroTest/CMakeLists.txt | 2 +-
.../RunCMake/FindPkgConfig/FindPkgConfig_NO_PKGCONFIG_PATH.cmake | 4 ++--
Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake | 2 +-
.../FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_ENVIRONMENT_PATH.cmake | 2 +-
.../FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_PATH.cmake | 2 +-
Tests/StringFileTest/CMakeLists.txt | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
