diff options
| author | Brad King <brad.king@kitware.com> | 2001-03-09 20:35:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2001-03-09 20:35:13 (GMT) |
| commit | 772b1f627826d6095b87f73ca6db7eef32d6482e (patch) | |
| tree | 982cb3c6fbec5b04ad0e47ed6b5188e5589aeb53 /Source | |
| parent | 05f863d5abb00f6b245554f0e3b7b0e9e7ff57a0 (diff) | |
| download | CMake-772b1f627826d6095b87f73ca6db7eef32d6482e.zip CMake-772b1f627826d6095b87f73ca6db7eef32d6482e.tar.gz CMake-772b1f627826d6095b87f73ca6db7eef32d6482e.tar.bz2 | |
ERR: Fixed library path problem for ReleaseMinSize build. should now be used in place of separate Release, Debug, and ReleaseMinSize.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmDSPMakefile.cxx | 7 | ||||
| -rw-r--r-- | Source/cmDSPWriter.cxx | 7 | ||||
| -rw-r--r-- | Source/staticLibHeader.dsptemplate | 4 |
3 files changed, 4 insertions, 14 deletions
diff --git a/Source/cmDSPMakefile.cxx b/Source/cmDSPMakefile.cxx index db60501..97359b8 100644 --- a/Source/cmDSPMakefile.cxx +++ b/Source/cmDSPMakefile.cxx @@ -74,21 +74,16 @@ void cmDSPMakefile::OutputDSPFile() { if(i->find("Release") == std::string::npos) { - m_DebugLibraryOptions += "/Debug\" "; + m_DebugLibraryOptions += "/$(OUTDIR)\" "; } } } m_DebugLibraryOptions += "/STACK:10000000 "; // add any extra define flags m_ReleaseLibraryOptions = m_DebugLibraryOptions; - cmSystemTools::ReplaceString(m_ReleaseLibraryOptions, "Debug", "Release"); m_DebugDLLLibraryOptions = m_DebugLibraryOptions; - cmSystemTools::ReplaceString(m_DebugDLLLibraryOptions, "Debug", "DebugDLL"); m_ReleaseDLLLibraryOptions = m_DebugDLLLibraryOptions; - cmSystemTools::ReplaceString(m_ReleaseDLLLibraryOptions, "Debug", "Release"); m_ReleaseMinSizeLibraryOptions = m_ReleaseLibraryOptions; - cmSystemTools::ReplaceString(m_ReleaseMinSizeLibraryOptions, - "Release", "ReleaseMinSize"); // Create the DSP or set of DSP's for libraries and executables if(strlen(m_Makefile->GetLibraryName()) != 0) diff --git a/Source/cmDSPWriter.cxx b/Source/cmDSPWriter.cxx index db60501..97359b8 100644 --- a/Source/cmDSPWriter.cxx +++ b/Source/cmDSPWriter.cxx @@ -74,21 +74,16 @@ void cmDSPMakefile::OutputDSPFile() { if(i->find("Release") == std::string::npos) { - m_DebugLibraryOptions += "/Debug\" "; + m_DebugLibraryOptions += "/$(OUTDIR)\" "; } } } m_DebugLibraryOptions += "/STACK:10000000 "; // add any extra define flags m_ReleaseLibraryOptions = m_DebugLibraryOptions; - cmSystemTools::ReplaceString(m_ReleaseLibraryOptions, "Debug", "Release"); m_DebugDLLLibraryOptions = m_DebugLibraryOptions; - cmSystemTools::ReplaceString(m_DebugDLLLibraryOptions, "Debug", "DebugDLL"); m_ReleaseDLLLibraryOptions = m_DebugDLLLibraryOptions; - cmSystemTools::ReplaceString(m_ReleaseDLLLibraryOptions, "Debug", "Release"); m_ReleaseMinSizeLibraryOptions = m_ReleaseLibraryOptions; - cmSystemTools::ReplaceString(m_ReleaseMinSizeLibraryOptions, - "Release", "ReleaseMinSize"); // Create the DSP or set of DSP's for libraries and executables if(strlen(m_Makefile->GetLibraryName()) != 0) diff --git a/Source/staticLibHeader.dsptemplate b/Source/staticLibHeader.dsptemplate index 9624f43..621ff91 100644 --- a/Source/staticLibHeader.dsptemplate +++ b/Source/staticLibHeader.dsptemplate @@ -97,8 +97,8 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "ReleaseMinSize"
# PROP Ignore_Export_Lib 0
# 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 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 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 /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
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
|