diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-28 19:09:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-06-28 19:09:44 (GMT) |
| commit | e34c5543faf33284ff9615d53fcfa5a163adf6c3 (patch) | |
| tree | 70267f66949339149a5423e81a95f7595775080a /Source | |
| parent | eb6f81705a8bfd89cf0afeb4c26d3e2944e3ecd3 (diff) | |
| parent | 943fe6e3b40cde7eb927bb2e2acf049fe580c188 (diff) | |
| download | CMake-e34c5543faf33284ff9615d53fcfa5a163adf6c3.zip CMake-e34c5543faf33284ff9615d53fcfa5a163adf6c3.tar.gz CMake-e34c5543faf33284ff9615d53fcfa5a163adf6c3.tar.bz2 | |
Merge branch 'revert-try_compile-config-flags' into release
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 0149fdf..75d0e9e 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: |