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

ENH: Implemented use of cmTarget::GetDirectory() in Visual Studio 6 generator. This is an incremental fix for bug#4210.

This commit is contained in:
Brad King 2007-03-09 16:25:16 -05:00
parent 92ff60b6a6
commit 80e6cade7a
6 changed files with 95 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
Source/cmLocalVisualStudio6Generator.cxx
View File

@ -851,13 +851,17 @@ inline std::string removeQuotes(const std::string& s)
// Code in blocks surrounded by a test for this definition is needed // Code in blocks surrounded by a test for this definition is needed
// only for compatibility with user project's replacement DSP // only for compatibility with user project's replacement DSP
// templates. The CMake templates no longer use them. // templates. The CMake templates no longer use them.
#define CM_USE_OLD_VS6 //#define CM_USE_OLD_VS6
void cmLocalVisualStudio6Generator void cmLocalVisualStudio6Generator
::WriteDSPHeader(std::ostream& fout, ::WriteDSPHeader(std::ostream& fout,
const char *libName, cmTarget &target, const char *libName, cmTarget &target,
std::vector<cmSourceGroup> &) std::vector<cmSourceGroup> &)
{ {
// Lookup the output directory for the target.
std::string outPath = target.GetDirectory();
#ifdef CM_USE_OLD_VS6
// Lookup the library and executable output directories. // Lookup the library and executable output directories.
std::string libPath; std::string libPath;
if(this->Makefile->GetDefinition("LIBRARY_OUTPUT_PATH")) if(this->Makefile->GetDefinition("LIBRARY_OUTPUT_PATH"))
@ -886,7 +890,6 @@ void cmLocalVisualStudio6Generator
} }
} }
#ifdef CM_USE_OLD_VS6
std::set<std::string> pathEmitted; std::set<std::string> pathEmitted;
// determine the link directories // determine the link directories
@ -1188,6 +1191,42 @@ void cmLocalVisualStudio6Generator
optionsRelWithDebInfo); optionsRelWithDebInfo);
} }
// Compute the path of the import library.
std::string targetImplibFlagDebug;
std::string targetImplibFlagRelease;
std::string targetImplibFlagMinSizeRel;
std::string targetImplibFlagRelWithDebInfo;
if(target.GetType() == cmTarget::SHARED_LIBRARY)
{
std::string fullPathImpDebug = target.GetDirectory("Debug", true);
std::string fullPathImpRelease = target.GetDirectory("Release", true);
std::string fullPathImpMinSizeRel = target.GetDirectory("MinSizeRel", true);
std::string fullPathImpRelWithDebInfo = target.GetDirectory("RelWithDebInfo", true);
fullPathImpDebug += "/";
fullPathImpRelease += "/";
fullPathImpMinSizeRel += "/";
fullPathImpRelWithDebInfo += "/";
fullPathImpDebug += target.GetFullName("Debug", true);
fullPathImpRelease += target.GetFullName("Release", true);
fullPathImpMinSizeRel += target.GetFullName("MinSizeRel", true);
fullPathImpRelWithDebInfo += target.GetFullName("RelWithDebInfo", true);
targetImplibFlagDebug = "/implib:";
targetImplibFlagRelease = "/implib:";
targetImplibFlagMinSizeRel = "/implib:";
targetImplibFlagRelWithDebInfo = "/implib:";
targetImplibFlagDebug +=
this->ConvertToOptionallyRelativeOutputPath(fullPathImpDebug.c_str());
targetImplibFlagRelease +=
this->ConvertToOptionallyRelativeOutputPath(fullPathImpRelease.c_str());
targetImplibFlagMinSizeRel +=
this->ConvertToOptionallyRelativeOutputPath(
fullPathImpMinSizeRel.c_str());
targetImplibFlagRelWithDebInfo +=
this->ConvertToOptionallyRelativeOutputPath(
fullPathImpRelWithDebInfo.c_str());
}
#ifdef CM_USE_OLD_VS6 #ifdef CM_USE_OLD_VS6
// Compute link information for the target. // Compute link information for the target.
if(extraLinkOptions.size()) if(extraLinkOptions.size())
@ -1300,7 +1339,16 @@ void cmLocalVisualStudio6Generator
this->IncludeOptions.c_str()); this->IncludeOptions.c_str());
cmSystemTools::ReplaceString(line, "TARGET_VERSION_FLAG", cmSystemTools::ReplaceString(line, "TARGET_VERSION_FLAG",
targetVersionFlag.c_str()); targetVersionFlag.c_str());
cmSystemTools::ReplaceString(line, "TARGET_IMPLIB_FLAG_DEBUG",
targetImplibFlagDebug.c_str());
cmSystemTools::ReplaceString(line, "TARGET_IMPLIB_FLAG_RELEASE",
targetImplibFlagRelease.c_str());
cmSystemTools::ReplaceString(line, "TARGET_IMPLIB_FLAG_MINSIZEREL",
targetImplibFlagMinSizeRel.c_str());
cmSystemTools::ReplaceString(line, "TARGET_IMPLIB_FLAG_RELWITHDEBINFO",
targetImplibFlagRelWithDebInfo.c_str());
cmSystemTools::ReplaceString(line, "OUTPUT_LIBNAME",libName); cmSystemTools::ReplaceString(line, "OUTPUT_LIBNAME",libName);
#ifdef CM_USE_OLD_VS6
// because LIBRARY_OUTPUT_PATH and EXECUTABLE_OUTPUT_PATH // because LIBRARY_OUTPUT_PATH and EXECUTABLE_OUTPUT_PATH
// are already quoted in the template file, // are already quoted in the template file,
// we need to remove the quotes here, we still need // we need to remove the quotes here, we still need
@ -1313,6 +1361,11 @@ void cmLocalVisualStudio6Generator
(line, "EXECUTABLE_OUTPUT_PATH", (line, "EXECUTABLE_OUTPUT_PATH",
removeQuotes(this->ConvertToOptionallyRelativeOutputPath removeQuotes(this->ConvertToOptionallyRelativeOutputPath
(exePath.c_str())).c_str()); (exePath.c_str())).c_str());
#endif
cmSystemTools::ReplaceString
(line, "OUTPUT_DIRECTORY",
removeQuotes(this->ConvertToOptionallyRelativeOutputPath
(outPath.c_str())).c_str());
cmSystemTools::ReplaceString(line, cmSystemTools::ReplaceString(line,
"EXTRA_DEFINES", "EXTRA_DEFINES",

18
Templates/DLLHeader.dsptemplate
View File

@ -33,7 +33,7 @@ CFG=OUTPUT_LIBNAME - Win32 Debug
# #
# BUILD_INCLUDES == include path # BUILD_INCLUDES == include path
# EXTRA_DEFINES == compiler defines # EXTRA_DEFINES == compiler defines
# LIBRARY_OUTPUT_PATH == override in output directory # OUTPUT_DIRECTORY == override in output directory
# OUTPUT_LIBNAME == name of output library # OUTPUT_LIBNAME == name of output library
# Begin Project # Begin Project
@ -53,7 +53,7 @@ RSC=rc.exe
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC CMAKE_MFC_FLAG # PROP Use_MFC CMAKE_MFC_FLAG
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "LIBRARY_OUTPUT_PATHRelease" # PROP Output_Dir "OUTPUT_DIRECTORY\Release"
# PROP Intermediate_Dir "Release" # PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
@ -71,7 +71,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 /nologo /dll /machine:I386 # ADD BASE LINK32 /nologo /dll /machine:I386
# ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /machine:I386 /out:"LIBRARY_OUTPUT_PATHRelease/OUTPUT_NAME_RELEASE" # ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /machine:I386 /out:"OUTPUT_DIRECTORY\Release/OUTPUT_NAME_RELEASE" TARGET_IMPLIB_FLAG_RELEASE
CM_MULTILINE_OPTIONS_RELEASE CM_MULTILINE_OPTIONS_RELEASE
CMAKE_CUSTOM_RULE_CODE CMAKE_CUSTOM_RULE_CODE
@ -85,7 +85,7 @@ CMAKE_CUSTOM_RULE_CODE
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC CMAKE_MFC_FLAG # PROP Use_MFC CMAKE_MFC_FLAG
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "LIBRARY_OUTPUT_PATHDebug" # PROP Output_Dir "OUTPUT_DIRECTORY\Debug"
# PROP Intermediate_Dir "Debug" # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
@ -103,7 +103,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept # ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /debug /machine:I386 /out:"LIBRARY_OUTPUT_PATHDebug/OUTPUT_NAME_DEBUG" /pdbtype:sept # ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /debug /machine:I386 /out:"OUTPUT_DIRECTORY\Debug/OUTPUT_NAME_DEBUG" /pdbtype:sept TARGET_IMPLIB_FLAG_DEBUG
CM_MULTILINE_OPTIONS_DEBUG CM_MULTILINE_OPTIONS_DEBUG
CMAKE_CUSTOM_RULE_CODE CMAKE_CUSTOM_RULE_CODE
@ -118,7 +118,7 @@ CMAKE_CUSTOM_RULE_CODE
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC CMAKE_MFC_FLAG # PROP Use_MFC CMAKE_MFC_FLAG
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "LIBRARY_OUTPUT_PATHMinSizeRel" # PROP Output_Dir "OUTPUT_DIRECTORY\MinSizeRel"
# PROP Intermediate_Dir "MinSizeRel" # PROP Intermediate_Dir "MinSizeRel"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
@ -137,7 +137,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 /nologo /dll /machine:I386 # ADD BASE LINK32 /nologo /dll /machine:I386
# ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /machine:I386 /out:"LIBRARY_OUTPUT_PATHMinSizeRel/OUTPUT_NAME_MINSIZEREL" # ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /machine:I386 /out:"OUTPUT_DIRECTORY\MinSizeRel/OUTPUT_NAME_MINSIZEREL" TARGET_IMPLIB_FLAG_MINSIZEREL
CM_MULTILINE_OPTIONS_MINSIZEREL CM_MULTILINE_OPTIONS_MINSIZEREL
CMAKE_CUSTOM_RULE_CODE CMAKE_CUSTOM_RULE_CODE
@ -151,7 +151,7 @@ CMAKE_CUSTOM_RULE_CODE
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC CMAKE_MFC_FLAG # PROP Use_MFC CMAKE_MFC_FLAG
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "LIBRARY_OUTPUT_PATHRelWithDebInfo" # PROP Output_Dir "OUTPUT_DIRECTORY\RelWithDebInfo"
# PROP Intermediate_Dir "RelWithDebInfo" # PROP Intermediate_Dir "RelWithDebInfo"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
@ -169,7 +169,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 /nologo /dll /machine:I386 /pdbtype:sept # ADD BASE LINK32 /nologo /dll /machine:I386 /pdbtype:sept
# ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /debug /machine:I386 /pdbtype:sept /out:"LIBRARY_OUTPUT_PATHRelWithDebInfo/OUTPUT_NAME_RELWITHDEBINFO" # ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /debug /machine:I386 /pdbtype:sept /out:"OUTPUT_DIRECTORY\RelWithDebInfo/OUTPUT_NAME_RELWITHDEBINFO" TARGET_IMPLIB_FLAG_RELWITHDEBINFO
CM_MULTILINE_OPTIONS_RELWITHDEBINFO CM_MULTILINE_OPTIONS_RELWITHDEBINFO
CMAKE_CUSTOM_RULE_CODE CMAKE_CUSTOM_RULE_CODE

18
Templates/EXEHeader.dsptemplate
View File

@ -11,7 +11,7 @@
# variables to REPLACE # variables to REPLACE
# #
# BUILD_INCLUDES == include path # BUILD_INCLUDES == include path
# EXECUTABLE_OUTPUT_PATH == override in output directory # OUTPUT_DIRECTORY == override in output directory
# EXTRA_DEFINES == compiler defines # EXTRA_DEFINES == compiler defines
# OUTPUT_LIBNAME == name of output library # OUTPUT_LIBNAME == name of output library
# CM_LIBRARIES == libraries linked in # CM_LIBRARIES == libraries linked in
@ -53,7 +53,7 @@ RSC=rc.exe
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC CMAKE_MFC_FLAG # PROP Use_MFC CMAKE_MFC_FLAG
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHRelease" # PROP Output_Dir "OUTPUT_DIRECTORY\Release"
# PROP Intermediate_Dir "Release" # PROP Intermediate_Dir "Release"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
@ -69,7 +69,7 @@ BSC32=bscmake.exe
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089 # ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089
# ADD LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089 TARGET_VERSION_FLAG # ADD LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089 TARGET_VERSION_FLAG
# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHRelease\OUTPUT_NAME_RELEASE" # ADD LINK32 /out:"OUTPUT_DIRECTORY\Release\OUTPUT_NAME_RELEASE"
CM_MULTILINE_OPTIONS_RELEASE CM_MULTILINE_OPTIONS_RELEASE
CMAKE_CUSTOM_RULE_CODE CMAKE_CUSTOM_RULE_CODE
@ -83,7 +83,7 @@ CMAKE_CUSTOM_RULE_CODE
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC CMAKE_MFC_FLAG # PROP Use_MFC CMAKE_MFC_FLAG
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHDebug" # PROP Output_Dir "OUTPUT_DIRECTORY\Debug"
# PROP Intermediate_Dir "Debug" # PROP Intermediate_Dir "Debug"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /GZ /c # ADD BASE CPP /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /GZ /c
@ -101,7 +101,7 @@ BSC32=bscmake.exe
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /IGNORE:4089 # ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /IGNORE:4089
# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /IGNORE:4089 TARGET_VERSION_FLAG # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /IGNORE:4089 TARGET_VERSION_FLAG
# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHDebug\OUTPUT_NAME_DEBUG" # ADD LINK32 /out:"OUTPUT_DIRECTORY\Debug\OUTPUT_NAME_DEBUG"
CM_MULTILINE_OPTIONS_DEBUG CM_MULTILINE_OPTIONS_DEBUG
CMAKE_CUSTOM_RULE_CODE CMAKE_CUSTOM_RULE_CODE
@ -114,7 +114,7 @@ CMAKE_CUSTOM_RULE_CODE
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC CMAKE_MFC_FLAG # PROP Use_MFC CMAKE_MFC_FLAG
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHMinSizeRel" # PROP Output_Dir "OUTPUT_DIRECTORY\MinSizeRel"
# PROP Intermediate_Dir "MinSizeRel" # PROP Intermediate_Dir "MinSizeRel"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
@ -130,7 +130,7 @@ BSC32=bscmake.exe
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089 # ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089
# ADD LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089 TARGET_VERSION_FLAG # ADD LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089 TARGET_VERSION_FLAG
# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHMinSizeRel\OUTPUT_NAME_MINSIZEREL" # ADD LINK32 /out:"OUTPUT_DIRECTORY\MinSizeRel\OUTPUT_NAME_MINSIZEREL"
CM_MULTILINE_OPTIONS_MINSIZEREL CM_MULTILINE_OPTIONS_MINSIZEREL
CMAKE_CUSTOM_RULE_CODE CMAKE_CUSTOM_RULE_CODE
@ -144,7 +144,7 @@ CMAKE_CUSTOM_RULE_CODE
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC CMAKE_MFC_FLAG # PROP Use_MFC CMAKE_MFC_FLAG
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHRelWithDebInfo" # PROP Output_Dir "OUTPUT_DIRECTORY\RelWithDebInfo"
# PROP Intermediate_Dir "RelWithDebInfo" # PROP Intermediate_Dir "RelWithDebInfo"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
@ -160,7 +160,7 @@ BSC32=bscmake.exe
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /IGNORE:4089 # ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /IGNORE:4089
# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /IGNORE:4089 TARGET_VERSION_FLAG # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /IGNORE:4089 TARGET_VERSION_FLAG
# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHRelWithDebInfo\OUTPUT_NAME_RELWITHDEBINFO" # ADD LINK32 /out:"OUTPUT_DIRECTORY\RelWithDebInfo\OUTPUT_NAME_RELWITHDEBINFO"
CM_MULTILINE_OPTIONS_RELWITHDEBINFO CM_MULTILINE_OPTIONS_RELWITHDEBINFO
CMAKE_CUSTOM_RULE_CODE CMAKE_CUSTOM_RULE_CODE

18
Templates/EXEWinHeader.dsptemplate
View File

@ -11,7 +11,7 @@
# variables to REPLACE # variables to REPLACE
# #
# BUILD_INCLUDES == include path # BUILD_INCLUDES == include path
# EXECUTABLE_OUTPUT_PATH == override in output directory # OUTPUT_DIRECTORY == override in output directory
# EXTRA_DEFINES == compiler defines # EXTRA_DEFINES == compiler defines
# OUTPUT_LIBNAME == name of output library # OUTPUT_LIBNAME == name of output library
# CM_LIBRARIES == libraries linked in # CM_LIBRARIES == libraries linked in
@ -53,7 +53,7 @@ RSC=rc.exe
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC CMAKE_MFC_FLAG # PROP Use_MFC CMAKE_MFC_FLAG
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHRelease" # PROP Output_Dir "OUTPUT_DIRECTORY\Release"
# PROP Intermediate_Dir "Release" # PROP Intermediate_Dir "Release"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
@ -71,7 +71,7 @@ BSC32=bscmake.exe
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 /IGNORE:4089 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 /IGNORE:4089
# ADD LINK32 /nologo /subsystem:windows /machine:I386 /IGNORE:4089 # ADD LINK32 /nologo /subsystem:windows /machine:I386 /IGNORE:4089
# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHRelease\OUTPUT_NAME_RELEASE" # ADD LINK32 /out:"OUTPUT_DIRECTORY\Release\OUTPUT_NAME_RELEASE"
CM_MULTILINE_OPTIONS_RELEASE CM_MULTILINE_OPTIONS_RELEASE
CMAKE_CUSTOM_RULE_CODE CMAKE_CUSTOM_RULE_CODE
@ -85,7 +85,7 @@ CMAKE_CUSTOM_RULE_CODE
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC CMAKE_MFC_FLAG # PROP Use_MFC CMAKE_MFC_FLAG
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHDebug" # PROP Output_Dir "OUTPUT_DIRECTORY\Debug"
# PROP Intermediate_Dir "Debug" # PROP Intermediate_Dir "Debug"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c # ADD BASE CPP /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
@ -103,7 +103,7 @@ BSC32=bscmake.exe
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /IGNORE:4089 # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /IGNORE:4089
# ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /IGNORE:4089 # ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /IGNORE:4089
# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHDebug\OUTPUT_NAME_DEBUG" # ADD LINK32 /out:"OUTPUT_DIRECTORY\Debug\OUTPUT_NAME_DEBUG"
CM_MULTILINE_OPTIONS_DEBUG CM_MULTILINE_OPTIONS_DEBUG
CMAKE_CUSTOM_RULE_CODE CMAKE_CUSTOM_RULE_CODE
@ -116,7 +116,7 @@ CMAKE_CUSTOM_RULE_CODE
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC CMAKE_MFC_FLAG # PROP Use_MFC CMAKE_MFC_FLAG
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHMinSizeRel" # PROP Output_Dir "OUTPUT_DIRECTORY\MinSizeRel"
# PROP Intermediate_Dir "MinSizeRel" # PROP Intermediate_Dir "MinSizeRel"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
@ -132,7 +132,7 @@ BSC32=bscmake.exe
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 /pdbtype:sept /IGNORE:4089 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 /pdbtype:sept /IGNORE:4089
# ADD LINK32 /nologo /subsystem:windows /machine:I386 /pdbtype:sept /IGNORE:4089 # ADD LINK32 /nologo /subsystem:windows /machine:I386 /pdbtype:sept /IGNORE:4089
# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHMinSizeRel\OUTPUT_NAME_MINSIZEREL" # ADD LINK32 /out:"OUTPUT_DIRECTORY\MinSizeRel\OUTPUT_NAME_MINSIZEREL"
CM_MULTILINE_OPTIONS_MINSIZEREL CM_MULTILINE_OPTIONS_MINSIZEREL
CMAKE_CUSTOM_RULE_CODE CMAKE_CUSTOM_RULE_CODE
@ -146,7 +146,7 @@ CMAKE_CUSTOM_RULE_CODE
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC CMAKE_MFC_FLAG # PROP Use_MFC CMAKE_MFC_FLAG
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHRelWithDebInfo" # PROP Output_Dir "OUTPUT_DIRECTORY\RelWithDebInfo"
# PROP Intermediate_Dir "RelWithDebInfo" # PROP Intermediate_Dir "RelWithDebInfo"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
@ -164,7 +164,7 @@ BSC32=bscmake.exe
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 /IGNORE:4089 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 /IGNORE:4089
# ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /IGNORE:4089 # ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /IGNORE:4089
# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHRelWithDebInfo\OUTPUT_NAME_RELWITHDEBINFO" # ADD LINK32 /out:"OUTPUT_DIRECTORY\RelWithDebInfo\OUTPUT_NAME_RELWITHDEBINFO"
CM_MULTILINE_OPTIONS_RELWITHDEBINFO CM_MULTILINE_OPTIONS_RELWITHDEBINFO
CMAKE_CUSTOM_RULE_CODE CMAKE_CUSTOM_RULE_CODE

8
Templates/UtilityHeader.dsptemplate
View File

@ -38,7 +38,7 @@ MTL=midl.exe
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHRelease" # PROP Output_Dir "OUTPUT_DIRECTORY\Release"
# PROP Intermediate_Dir "Release" # PROP Intermediate_Dir "Release"
# PROP Target_Dir "" # PROP Target_Dir ""
@ -53,7 +53,7 @@ CMAKE_CUSTOM_RULE_CODE
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHDebug" # PROP Output_Dir "OUTPUT_DIRECTORY\Debug"
# PROP Intermediate_Dir "Debug" # PROP Intermediate_Dir "Debug"
# PROP Target_Dir "" # PROP Target_Dir ""
@ -68,7 +68,7 @@ CMAKE_CUSTOM_RULE_CODE
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHMinSizeRel" # PROP Output_Dir "OUTPUT_DIRECTORY\MinSizeRel"
# PROP Intermediate_Dir "MinSizeRel" # PROP Intermediate_Dir "MinSizeRel"
# PROP Target_Dir "" # PROP Target_Dir ""
@ -83,7 +83,7 @@ CMAKE_CUSTOM_RULE_CODE
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHRelWithDebInfo" # PROP Output_Dir "OUTPUT_DIRECTORY\RelWithDebInfo"
# PROP Intermediate_Dir "RelWithDebInfo" # PROP Intermediate_Dir "RelWithDebInfo"
# PROP Target_Dir "" # PROP Target_Dir ""

18
Templates/staticLibHeader.dsptemplate
View File

@ -12,7 +12,7 @@
# #
# BUILD_INCLUDES == include path # BUILD_INCLUDES == include path
# EXTRA_DEFINES == compiler defines # EXTRA_DEFINES == compiler defines
# LIBRARY_OUTPUT_PATH == override in output directory # OUTPUT_DIRECTORY == override in output directory
# OUTPUT_LIBNAME == name of output library # OUTPUT_LIBNAME == name of output library
# TARGTYPE "Win32 (x86) Static Library" 0x0104 # TARGTYPE "Win32 (x86) Static Library" 0x0104
@ -50,7 +50,7 @@ RSC=rc.exe
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC CMAKE_MFC_FLAG # PROP Use_MFC CMAKE_MFC_FLAG
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "LIBRARY_OUTPUT_PATHRelease" # PROP Output_Dir "OUTPUT_DIRECTORY\Release"
# PROP Intermediate_Dir "Release" # PROP Intermediate_Dir "Release"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_LIB" /FD /c # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_LIB" /FD /c
@ -65,7 +65,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo # ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"LIBRARY_OUTPUT_PATHRelease/OUTPUT_NAME_RELEASE" CM_STATIC_LIB_ARGS # ADD LIB32 /nologo /out:"OUTPUT_DIRECTORY\Release/OUTPUT_NAME_RELEASE" CM_STATIC_LIB_ARGS
CMAKE_CUSTOM_RULE_CODE CMAKE_CUSTOM_RULE_CODE
@ -78,7 +78,7 @@ CMAKE_CUSTOM_RULE_CODE
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC CMAKE_MFC_FLAG # PROP Use_MFC CMAKE_MFC_FLAG
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "LIBRARY_OUTPUT_PATHDebug" # PROP Output_Dir "OUTPUT_DIRECTORY\Debug"
# PROP Intermediate_Dir "Debug" # PROP Intermediate_Dir "Debug"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /D "WIN32" /D "_DEBUG" /D "_LIB" /FD /c # ADD BASE CPP /nologo /D "WIN32" /D "_DEBUG" /D "_LIB" /FD /c
@ -93,7 +93,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo # ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"LIBRARY_OUTPUT_PATHDebug/OUTPUT_NAME_DEBUG" CM_STATIC_LIB_ARGS # ADD LIB32 /nologo /out:"OUTPUT_DIRECTORY\Debug/OUTPUT_NAME_DEBUG" CM_STATIC_LIB_ARGS
CMAKE_CUSTOM_RULE_CODE CMAKE_CUSTOM_RULE_CODE
@ -106,7 +106,7 @@ CMAKE_CUSTOM_RULE_CODE
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC CMAKE_MFC_FLAG # PROP Use_MFC CMAKE_MFC_FLAG
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "LIBRARY_OUTPUT_PATHMinSizeRel" # PROP Output_Dir "OUTPUT_DIRECTORY\MinSizeRel"
# PROP Intermediate_Dir "MinSizeRel" # PROP Intermediate_Dir "MinSizeRel"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
@ -122,7 +122,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo # ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"LIBRARY_OUTPUT_PATHMinSizeRel/OUTPUT_NAME_MINSIZEREL" CM_STATIC_LIB_ARGS # ADD LIB32 /nologo /out:"OUTPUT_DIRECTORY\MinSizeRel/OUTPUT_NAME_MINSIZEREL" CM_STATIC_LIB_ARGS
CMAKE_CUSTOM_RULE_CODE CMAKE_CUSTOM_RULE_CODE
@ -135,7 +135,7 @@ CMAKE_CUSTOM_RULE_CODE
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC CMAKE_MFC_FLAG # PROP Use_MFC CMAKE_MFC_FLAG
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "LIBRARY_OUTPUT_PATHRelWithDebInfo" # PROP Output_Dir "OUTPUT_DIRECTORY\RelWithDebInfo"
# PROP Intermediate_Dir "RelWithDebInfo" # PROP Intermediate_Dir "RelWithDebInfo"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_LIB" /FD /c # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_LIB" /FD /c
@ -150,7 +150,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo # ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"LIBRARY_OUTPUT_PATHRelWithDebInfo/OUTPUT_NAME_RELWITHDEBINFO" CM_STATIC_LIB_ARGS # ADD LIB32 /nologo /out:"OUTPUT_DIRECTORY\RelWithDebInfo/OUTPUT_NAME_RELWITHDEBINFO" CM_STATIC_LIB_ARGS
CMAKE_CUSTOM_RULE_CODE CMAKE_CUSTOM_RULE_CODE