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

ERR: Fixed library path problem for ReleaseMinSize build. should now be used in place of separate Release, Debug, and ReleaseMinSize.

This commit is contained in:
Brad King 2001-03-09 15:35:13 -05:00
parent 05f863d5ab
commit 772b1f6278
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmDSPMakefile.cxx
View File

@ -74,21 +74,16 @@ void cmDSPMakefile::OutputDSPFile()
{ {
if(i->find("Release") == std::string::npos) if(i->find("Release") == std::string::npos)
{ {
m_DebugLibraryOptions += "/Debug\" "; m_DebugLibraryOptions += "/$(OUTDIR)\" ";
} }
} }
} }
m_DebugLibraryOptions += "/STACK:10000000 "; m_DebugLibraryOptions += "/STACK:10000000 ";
// add any extra define flags // add any extra define flags
m_ReleaseLibraryOptions = m_DebugLibraryOptions; m_ReleaseLibraryOptions = m_DebugLibraryOptions;
cmSystemTools::ReplaceString(m_ReleaseLibraryOptions, "Debug", "Release");
m_DebugDLLLibraryOptions = m_DebugLibraryOptions; m_DebugDLLLibraryOptions = m_DebugLibraryOptions;
cmSystemTools::ReplaceString(m_DebugDLLLibraryOptions, "Debug", "DebugDLL");
m_ReleaseDLLLibraryOptions = m_DebugDLLLibraryOptions; m_ReleaseDLLLibraryOptions = m_DebugDLLLibraryOptions;
cmSystemTools::ReplaceString(m_ReleaseDLLLibraryOptions, "Debug", "Release");
m_ReleaseMinSizeLibraryOptions = m_ReleaseLibraryOptions; m_ReleaseMinSizeLibraryOptions = m_ReleaseLibraryOptions;
cmSystemTools::ReplaceString(m_ReleaseMinSizeLibraryOptions,
"Release", "ReleaseMinSize");
// Create the DSP or set of DSP's for libraries and executables // Create the DSP or set of DSP's for libraries and executables
if(strlen(m_Makefile->GetLibraryName()) != 0) if(strlen(m_Makefile->GetLibraryName()) != 0)

7
Source/cmDSPWriter.cxx
View File

@ -74,21 +74,16 @@ void cmDSPMakefile::OutputDSPFile()
{ {
if(i->find("Release") == std::string::npos) if(i->find("Release") == std::string::npos)
{ {
m_DebugLibraryOptions += "/Debug\" "; m_DebugLibraryOptions += "/$(OUTDIR)\" ";
} }
} }
} }
m_DebugLibraryOptions += "/STACK:10000000 "; m_DebugLibraryOptions += "/STACK:10000000 ";
// add any extra define flags // add any extra define flags
m_ReleaseLibraryOptions = m_DebugLibraryOptions; m_ReleaseLibraryOptions = m_DebugLibraryOptions;
cmSystemTools::ReplaceString(m_ReleaseLibraryOptions, "Debug", "Release");
m_DebugDLLLibraryOptions = m_DebugLibraryOptions; m_DebugDLLLibraryOptions = m_DebugLibraryOptions;
cmSystemTools::ReplaceString(m_DebugDLLLibraryOptions, "Debug", "DebugDLL");
m_ReleaseDLLLibraryOptions = m_DebugDLLLibraryOptions; m_ReleaseDLLLibraryOptions = m_DebugDLLLibraryOptions;
cmSystemTools::ReplaceString(m_ReleaseDLLLibraryOptions, "Debug", "Release");
m_ReleaseMinSizeLibraryOptions = m_ReleaseLibraryOptions; m_ReleaseMinSizeLibraryOptions = m_ReleaseLibraryOptions;
cmSystemTools::ReplaceString(m_ReleaseMinSizeLibraryOptions,
"Release", "ReleaseMinSize");
// Create the DSP or set of DSP's for libraries and executables // Create the DSP or set of DSP's for libraries and executables
if(strlen(m_Makefile->GetLibraryName()) != 0) if(strlen(m_Makefile->GetLibraryName()) != 0)

4
Source/staticLibHeader.dsptemplate
View File

@ -97,8 +97,8 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "ReleaseMinSize" # PROP Intermediate_Dir "ReleaseMinSize"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /FD /c # ADD BASE CPP /nologo /MD /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /FD /c
# ADD CPP /nologo /GR /GX /Zm1000 /MT /W3 /O1 BUILD_INCLUDES EXTRA_DEFINES /D "NDEBUG" /D "_MBCS" /D "_ATL_DLL" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /FD /c # ADD CPP /nologo /GR /GX /Zm1000 /MD /W3 /O1 BUILD_INCLUDES EXTRA_DEFINES /D "NDEBUG" /D "_MBCS" /D "_ATL_DLL" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /FD /c
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"