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 f86efd538055a50001396eed9648f151a0a54088 (commit)
via 6d604c4972d744defe783e7a5f9fbf478eee2dfe (commit)
from d98f7178adc3cb8ea3f46302e3efaf2f58088a8f (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=f86efd538055a50001396eed9648f151a0a54088
commit f86efd538055a50001396eed9648f151a0a54088
Merge: d98f717 6d604c4
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 28 14:36:36 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Nov 28 14:36:36 2016 -0500
Merge topic 'try_compile-honor-CMAKE_WARN_DEPRECATED' into next
6d604c49 try_compile: Honor CMAKE_WARN_DEPRECATED in test project
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d604c4972d744defe783e7a5f9fbf478eee2dfe
commit 6d604c4972d744defe783e7a5f9fbf478eee2dfe
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 22 10:08:45 2016 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Nov 22 10:17:20 2016 -0500
try_compile: Honor CMAKE_WARN_DEPRECATED in test project
This causes the `-Wno-deprecated` option to be honored even inside a
`try_compile` test project, which is needed to suppress all deprecation
warnings as the option documents.
Closes: #16446
diff --git a/Help/release/dev/try_compile-honor-CMAKE_WARN_DEPRECATED.rst
b/Help/release/dev/try_compile-honor-CMAKE_WARN_DEPRECATED.rst
new file mode 100644
index 0000000..9e13575
--- /dev/null
+++ b/Help/release/dev/try_compile-honor-CMAKE_WARN_DEPRECATED.rst
@@ -0,0 +1,6 @@
+try_compile-honor-CMAKE_WARN_DEPRECATED
+---------------------------------------
+
+* The :command:`try_compile` command source file signature now
+ honors the :variable:`CMAKE_WARN_DEPRECATED` variable value
+ in the generated test project.
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 3b46fc0..fbad778 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -44,6 +44,7 @@ static std::string const kCMAKE_TRY_COMPILE_OSX_ARCHITECTURES
=
"CMAKE_TRY_COMPILE_OSX_ARCHITECTURES";
static std::string const kCMAKE_TRY_COMPILE_PLATFORM_VARIABLES =
"CMAKE_TRY_COMPILE_PLATFORM_VARIABLES";
+static std::string const kCMAKE_WARN_DEPRECATED = "CMAKE_WARN_DEPRECATED";
int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv,
bool isTryRun)
@@ -453,6 +454,7 @@ int
cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv,
vars.insert(kCMAKE_OSX_SYSROOT);
vars.insert(kCMAKE_POSITION_INDEPENDENT_CODE);
vars.insert(kCMAKE_SYSROOT);
+ vars.insert(kCMAKE_WARN_DEPRECATED);
if (const char* varListStr = this->Makefile->GetDefinition(
kCMAKE_TRY_COMPILE_PLATFORM_VARIABLES)) {
diff --git a/Tests/RunCMake/try_compile/RunCMakeTest.cmake
b/Tests/RunCMake/try_compile/RunCMakeTest.cmake
index 522433a..4934bcd 100644
--- a/Tests/RunCMake/try_compile/RunCMakeTest.cmake
+++ b/Tests/RunCMake/try_compile/RunCMakeTest.cmake
@@ -18,6 +18,7 @@ run_cmake(NonSourceCompileDefinitions)
set(RunCMake_TEST_OPTIONS --debug-trycompile)
run_cmake(PlatformVariables)
+run_cmake(WarnDeprecated)
unset(RunCMake_TEST_OPTIONS)
run_cmake(TargetTypeExe)
diff --git a/Tests/RunCMake/try_compile/WarnDeprecated.cmake
b/Tests/RunCMake/try_compile/WarnDeprecated.cmake
new file mode 100644
index 0000000..dfcb5f9
--- /dev/null
+++ b/Tests/RunCMake/try_compile/WarnDeprecated.cmake
@@ -0,0 +1,19 @@
+enable_language(C)
+
+set(CMAKE_WARN_DEPRECATED SOME_VALUE)
+
+try_compile(result ${CMAKE_CURRENT_BINARY_DIR}
+ SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src.c
+ OUTPUT_VARIABLE out
+ )
+if(NOT result)
+ message(FATAL_ERROR "try_compile failed:\n${out}")
+endif()
+
+# Check that the cache was populated with our custom variable.
+file(STRINGS ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CMakeCache.txt entries
+ REGEX CMAKE_WARN_DEPRECATED:UNINITIALIZED=${CMAKE_WARN_DEPRECATED}
+ )
+if(NOT entries)
+ message(FATAL_ERROR "try_compile did not populate cache as expected")
+endif()
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/try_compile-honor-CMAKE_WARN_DEPRECATED.rst | 6 ++++++
Source/cmCoreTryCompile.cxx | 2 ++
Tests/RunCMake/try_compile/RunCMakeTest.cmake | 1 +
.../{PlatformVariables.cmake => WarnDeprecated.cmake} | 8 ++------
4 files changed, 11 insertions(+), 6 deletions(-)
create mode 100644 Help/release/dev/try_compile-honor-CMAKE_WARN_DEPRECATED.rst
copy Tests/RunCMake/try_compile/{PlatformVariables.cmake =>
WarnDeprecated.cmake} (59%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
