diff options
author | Brad King <brad.king@kitware.com> | 2016-06-29 13:07:28 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-29 13:07:28 (GMT) |
commit | db4ba61f3974258ad972a1594ee7b0d5b6f7a68c (patch) | |
tree | ca6758f2967aeefe016b0ccf4ca80b53b284c0c3 /Source/cmCoreTryCompile.cxx | |
parent | b9b3ec4d98b03c180b2e6b9ad8edba7f75576353 (diff) | |
parent | 943fe6e3b40cde7eb927bb2e2acf049fe580c188 (diff) | |
download | CMake-db4ba61f3974258ad972a1594ee7b0d5b6f7a68c.zip CMake-db4ba61f3974258ad972a1594ee7b0d5b6f7a68c.tar.gz CMake-db4ba61f3974258ad972a1594ee7b0d5b6f7a68c.tar.bz2 |
Merge topic 'revert-try_compile-config-flags'
943fe6e3 Revert "try_compile: Honor CMAKE_<LANG>_FLAGS_<CONFIG> changes"
Diffstat (limited to 'Source/cmCoreTryCompile.cxx')
-rw-r--r-- | Source/cmCoreTryCompile.cxx | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx index 7d35a9e..805d8e8 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/Source/cmCoreTryCompile.cxx @@ -333,14 +333,6 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv, fprintf(fout, "set(CMAKE_%s_FLAGS \"${CMAKE_%s_FLAGS}" " ${COMPILE_DEFINITIONS}\")\n", li->c_str(), li->c_str()); - static std::string const cfgDefault = "DEBUG"; - std::string const cfg = - !tcConfig.empty() ? cmSystemTools::UpperCase(tcConfig) : cfgDefault; - std::string const langFlagsCfg = "CMAKE_" + *li + "_FLAGS_" + cfg; - const char* flagsCfg = this->Makefile->GetDefinition(langFlagsCfg); - fprintf( - fout, "set(%s %s)\n", langFlagsCfg.c_str(), - cmOutputConverter::EscapeForCMake(flagsCfg ? flagsCfg : "").c_str()); } switch (this->Makefile->GetPolicyStatus(cmPolicies::CMP0056)) { case cmPolicies::WARN: |