diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-28 15:03:00 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-06-28 15:03:45 -0400 |
| commit | 943fe6e3b40cde7eb927bb2e2acf049fe580c188 (patch) | |
| tree | c3732527bd7ace57a608042aca02aead3eae7145 /Source | |
| parent | d152ae123d1a3df456fe24f2e1a06d97083ad2d2 (diff) | |
| download | cmake-943fe6e3b40cde7eb927bb2e2acf049fe580c188.tar.gz | |
Revert "try_compile: Honor CMAKE_<LANG>_FLAGS_<CONFIG> changes"
Revert commit v3.6.0-rc1~160^2 (try_compile: Honor
CMAKE_<LANG>_FLAGS_<CONFIG> changes, 2016-04-11). The behavior it
introduced can break projects that depend on the lack of such behavior.
We will have to introduce a policy or other mechanism to enable the
behavior in a compatible way. Simply revert it for now.
See issue #16174.
Diffstat (limited to 'Source')
| -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 0149fdfc74..75d0e9e0aa 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: |