kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Brad King 2007-03-07 15:57:52 -05:00
parent 100723fbb0
commit 0e8515fa4c
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/Platform/Windows-cl.cmake
View File

@ -66,11 +66,7 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR CMAKE_GENERATOR MATCHES "Visual
SET (CMAKE_NO_BUILD_TYPE 1) SET (CMAKE_NO_BUILD_TYPE 1)
SET (CMAKE_CONFIGURATION_TYPES "Debug;Release;MinSizeRel;RelWithDebInfo" CACHE STRING 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.") "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 MARK_AS_ADVANCED(CMAKE_CONFIGURATION_TYPES)
"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)
ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR CMAKE_GENERATOR MATCHES "Visual Studio 8") 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 # does the compiler support pdbtype and is it the newer compiler
IF(CMAKE_GENERATOR MATCHES "Visual Studio 8") IF(CMAKE_GENERATOR MATCHES "Visual Studio 8")

11
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -587,17 +587,6 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
targetOptions.AddDefine(exportSymbol); 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 // The intermediate directory name consists of a directory for the
// target and a subdirectory for the configuration name. // target and a subdirectory for the configuration name.
std::string intermediateDir = this->GetTargetDirectory(target); std::string intermediateDir = this->GetTargetDirectory(target);