diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-29 13:59:07 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-11-29 13:59:07 (GMT) |
| commit | 2f7bafd6dacbe83b881866c0c7a00847ef266382 (patch) | |
| tree | 9ecdc1ad603611ab2a2391f9c5b000f8a6d31e23 /Source | |
| parent | 4838ca14dfe9ee17b2c788b91227d8f7bf733f06 (diff) | |
| parent | 6d604c4972d744defe783e7a5f9fbf478eee2dfe (diff) | |
| download | CMake-2f7bafd6dacbe83b881866c0c7a00847ef266382.zip CMake-2f7bafd6dacbe83b881866c0c7a00847ef266382.tar.gz CMake-2f7bafd6dacbe83b881866c0c7a00847ef266382.tar.bz2 | |
Merge topic 'try_compile-honor-CMAKE_WARN_DEPRECATED'
6d604c49 try_compile: Honor CMAKE_WARN_DEPRECATED in test project
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmCoreTryCompile.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
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)) { |