ENH: Removed dependency on Templates/CMakeWindowsSystemConfig.cmake which is no longer used. Also removed the file itself.
This commit is contained in:
parent
bb82b48715
commit
e5bb99e010
|
@ -217,23 +217,7 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
|
|||
START_OUTPUT, UNCHANGED, true);
|
||||
commandLine.push_back(args);
|
||||
|
||||
std::string configFile =
|
||||
this->Makefile->GetRequiredDefinition("CMAKE_ROOT");
|
||||
configFile += "/Templates/CMakeWindowsSystemConfig.cmake";
|
||||
std::vector<std::string> listFiles = this->Makefile->GetListFiles();
|
||||
bool found = false;
|
||||
for(std::vector<std::string>::iterator i = listFiles.begin();
|
||||
i != listFiles.end(); ++i)
|
||||
{
|
||||
if(*i == configFile)
|
||||
{
|
||||
found = true;
|
||||
}
|
||||
}
|
||||
if(!found)
|
||||
{
|
||||
listFiles.push_back(configFile);
|
||||
}
|
||||
std::vector<std::string> const& listFiles = this->Makefile->GetListFiles();
|
||||
|
||||
cmCustomCommandLines commandLines;
|
||||
commandLines.push_back(commandLine);
|
||||
|
|
|
@ -204,23 +204,7 @@ void cmLocalVisualStudio7Generator::AddVCProjBuildRule(cmTarget& tgt)
|
|||
START_OUTPUT, UNCHANGED, true);
|
||||
commandLine.push_back(args);
|
||||
|
||||
std::string configFile =
|
||||
this->Makefile->GetRequiredDefinition("CMAKE_ROOT");
|
||||
configFile += "/Templates/CMakeWindowsSystemConfig.cmake";
|
||||
std::vector<std::string> listFiles = this->Makefile->GetListFiles();
|
||||
bool found = false;
|
||||
for(std::vector<std::string>::iterator i = listFiles.begin();
|
||||
i != listFiles.end(); ++i)
|
||||
{
|
||||
if(*i == configFile)
|
||||
{
|
||||
found = true;
|
||||
}
|
||||
}
|
||||
if(!found)
|
||||
{
|
||||
listFiles.push_back(configFile);
|
||||
}
|
||||
std::vector<std::string> const& listFiles = this->Makefile->GetListFiles();
|
||||
|
||||
cmCustomCommandLines commandLines;
|
||||
commandLines.push_back(commandLine);
|
||||
|
|
|
@ -1,81 +0,0 @@
|
|||
# Microsoft specific config file
|
||||
|
||||
SET (CMAKE_BUILD_TOOL msdev CACHE INTERNAL
|
||||
"What is the target build tool cmake is generating for.")
|
||||
|
||||
SET (CMAKE_SYSTEM "Win32" CACHE INTERNAL
|
||||
"What system is this. Result of uname.")
|
||||
|
||||
SET (CMAKE_CXX_COMPILER cl CACHE STRING
|
||||
"Name of C++ compiler used.")
|
||||
|
||||
SET (CMAKE_CXX_FLAGS_RELEASE "/MD /O2" CACHE STRING
|
||||
"Flags used by the compiler during release builds (/MD /Ob1 /Oi /Ot /Oy /Gs will produce slightly less optimized but smaller files)")
|
||||
|
||||
SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD /Zi /O2" CACHE STRING
|
||||
"Flags used by the compiler during Release with Debug Info builds")
|
||||
|
||||
SET (CMAKE_CXX_FLAGS_MINSIZEREL "/MD /O1" CACHE STRING
|
||||
"Flags used by the compiler during release minsize builds")
|
||||
|
||||
SET (CMAKE_CXX_FLAGS_DEBUG "/MDd /Zi /Od /GZ" CACHE STRING
|
||||
"Flags used by the compiler during debug builds")
|
||||
|
||||
SET (CMAKE_CXX_FLAGS "/nologo /W3 /Zm1000 /GX /GR" CACHE STRING
|
||||
"Flags used by the compiler during all build types, /GX /GR are for exceptions and rtti in VC++, /Zm1000 increases the compiler's memory allocation to support ANSI C++/stdlib")
|
||||
|
||||
SET (CMAKE_EXTRA_LINK_FLAGS "/STACK:10000000" CACHE STRING
|
||||
"Extra flags added to the link line for creation of exe and dlls.")
|
||||
|
||||
SET (CMAKE_USE_WIN32_THREADS 1 CACHE BOOL
|
||||
"Use the win32 thread library")
|
||||
|
||||
SET (CMAKE_MAKE_PROGRAM "msdev" CACHE STRING
|
||||
"Program used to build from dsp files.")
|
||||
|
||||
# We will hardcode them for now. Make sure to fix that in the future
|
||||
SET (CMAKE_SIZEOF_INT 4 CACHE INTERNAL "Size of int data type")
|
||||
SET (CMAKE_SIZEOF_LONG 4 CACHE INTERNAL "Size of long data type")
|
||||
SET (CMAKE_SIZEOF_VOID_P 4 CACHE INTERNAL "Size of void* data type")
|
||||
SET (CMAKE_SIZEOF_CHAR 1 CACHE INTERNAL "Size of char data type")
|
||||
SET (CMAKE_SIZEOF_SHORT 2 CACHE INTERNAL "Size of short data type")
|
||||
SET (CMAKE_SIZEOF_FLOAT 4 CACHE INTERNAL "Size of float data type")
|
||||
SET (CMAKE_SIZEOF_DOUBLE 8 CACHE INTERNAL "Size of double data type")
|
||||
|
||||
# Suffixes
|
||||
|
||||
SET (CMAKE_EXECUTABLE_SUFFIX ".exe" CACHE INTERNAL
|
||||
"Executable suffix.")
|
||||
|
||||
SET (CMAKE_MODULE_SUFFIX ".dll" CACHE INTERNAL
|
||||
"Module library suffix.")
|
||||
|
||||
SET (CMAKE_SHLIB_SUFFIX ".dll" CACHE INTERNAL
|
||||
"Shared library suffix.")
|
||||
|
||||
SET (CMAKE_STATICLIB_SUFFIX ".lib" CACHE INTERNAL
|
||||
"Static library suffix.")
|
||||
|
||||
# The following variables are advanced
|
||||
|
||||
MARK_AS_ADVANCED(
|
||||
CMAKE_CXX_COMPILER
|
||||
CMAKE_CXX_FLAGS
|
||||
CMAKE_CXX_FLAGS_DEBUG
|
||||
CMAKE_CXX_FLAGS_MINSIZEREL
|
||||
CMAKE_CXX_FLAGS_RELEASE
|
||||
CMAKE_CXX_FLAGS_RELWITHDEBINFO
|
||||
CMAKE_EXECUTABLE_SUFFIX
|
||||
CMAKE_EXTRA_LINK_FLAGS
|
||||
CMAKE_MAKE_PROGRAM
|
||||
CMAKE_MODULE_SUFFIX
|
||||
CMAKE_OBJECT_FILE_SUFFIX
|
||||
CMAKE_SHLIB_SUFFIX
|
||||
CMAKE_STATICLIB_SUFFIX
|
||||
CMAKE_USE_WIN32_THREADS
|
||||
HAVE_LIMITS_H
|
||||
HAVE_UNISTD_H
|
||||
WORDS_BIGENDIAN
|
||||
)
|
||||
|
||||
|
Loading…
Reference in New Issue