diff options
| author | Brad King <brad.king@kitware.com> | 2007-03-07 20:57:52 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2007-03-07 20:57:52 (GMT) |
| commit | 0e8515fa4c87883ecb45ede6315f11edce6d0f7b (patch) | |
| tree | 0d50b53bf61081fd6755d40bf2dd0e6f41af8a87 | |
| parent | 100723fbb083ebbb0376e6d9e01856094f49e4e5 (diff) | |
| download | CMake-0e8515fa4c87883ecb45ede6315f11edce6d0f7b.zip CMake-0e8515fa4c87883ecb45ede6315f11edce6d0f7b.tar.gz CMake-0e8515fa4c87883ecb45ede6315f11edce6d0f7b.tar.bz2 | |
BUG: Get rid of ancient variables CMAKE_CXX_WARNING_LEVEL, CMAKE_CXX_USE_RTTI, CMAKE_CXX_STACK_SIZE which are only partially implemented and now taken care of by flag mapping anyway.
| -rw-r--r-- | Modules/Platform/Windows-cl.cmake | 6 | ||||
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 11 |
2 files changed, 1 insertions, 16 deletions
diff --git a/Modules/Platform/Windows-cl.cmake b/Modules/Platform/Windows-cl.cmake index a2338ef..a89105a 100644 --- a/Modules/Platform/Windows-cl.cmake +++ b/Modules/Platform/Windows-cl.cmake @@ -66,11 +66,7 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR CMAKE_GENERATOR MATCHES "Visual SET (CMAKE_NO_BUILD_TYPE 1) SET (CMAKE_CONFIGURATION_TYPES "Debug;Release;MinSizeRel;RelWithDebInfo" CACHE STRING "Semicolon separated list of supported configuration types, only supports Debug, Release, MinSizeRel, and RelWithDebInfo, anything else will be ignored.") - SET (CMAKE_CXX_WARNING_LEVEL "3" CACHE STRING - "Default compiler warning level for C++.") - SET (CMAKE_CXX_STACK_SIZE "10000000" CACHE STRING - "Size of stack for programs.") - MARK_AS_ADVANCED(CMAKE_CONFIGURATION_TYPES CMAKE_CXX_STACK_SIZE CMAKE_CXX_WARNING_LEVEL) + MARK_AS_ADVANCED(CMAKE_CONFIGURATION_TYPES) ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR CMAKE_GENERATOR MATCHES "Visual Studio 8") # does the compiler support pdbtype and is it the newer compiler IF(CMAKE_GENERATOR MATCHES "Visual Studio 8") diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index ee1c014..abfaa71 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -587,17 +587,6 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout, targetOptions.AddDefine(exportSymbol); } - // Override the flag map with cmake-specific settings. - if(this->Makefile->IsOn("CMAKE_CXX_USE_RTTI")) - { - targetOptions.AddFlag("RuntimeTypeInfo", "TRUE"); - } - if(const char* warningLevel = - this->Makefile->GetDefinition("CMAKE_CXX_WARNING_LEVEL")) - { - targetOptions.AddFlag("WarningLevel", warningLevel); - } - // The intermediate directory name consists of a directory for the // target and a subdirectory for the configuration name. std::string intermediateDir = this->GetTargetDirectory(target); |