From 331c517eeb8c11e8fc67598a8156d14a2a865533 Mon Sep 17 00:00:00 2001 From: Ian Scott Date: Tue, 3 Jul 2001 05:27:39 -0400 Subject: [PATCH] Renamed the ReleaseWithDebugInfo Build configuration to RelWithDebInfo, because msdev does simple matching on build target, and specifying either Release or Debug builds would also build ReleaseWithDebugInfo --- Source/cmDSPWriter.cxx | 4 ++-- Templates/CMakeWindowsSystemConfig.cmake | 4 ++-- Templates/DLLHeader.dsptemplate | 16 ++++++++-------- Templates/EXEHeader.dsptemplate | 16 ++++++++-------- Templates/EXEWinHeader.dsptemplate | 16 ++++++++-------- Templates/UtilityHeader.dsptemplate | 14 +++++++------- Templates/staticLibHeader.dsptemplate | 16 ++++++++-------- 7 files changed, 43 insertions(+), 43 deletions(-) diff --git a/Source/cmDSPWriter.cxx b/Source/cmDSPWriter.cxx index 71973df49..582d1ada9 100644 --- a/Source/cmDSPWriter.cxx +++ b/Source/cmDSPWriter.cxx @@ -634,9 +634,9 @@ void cmDSPWriter::WriteDSPHeader(std::ostream& fout, const char *libName, m_Makefile-> GetDefinition("CMAKE_CXX_FLAGS_DEBUG")); cmSystemTools::ReplaceString(line, - "CMAKE_CXX_FLAGS_RELWITHDEBUGINFO", + "CMAKE_CXX_FLAGS_RELWITHDEBINFO", m_Makefile-> - GetDefinition("CMAKE_CXX_FLAGS_RELWITHDEBUGINFO")); + GetDefinition("CMAKE_CXX_FLAGS_RELWITHDEBINFO")); cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS", m_Makefile-> diff --git a/Templates/CMakeWindowsSystemConfig.cmake b/Templates/CMakeWindowsSystemConfig.cmake index 267e322f6..69199ed3f 100644 --- a/Templates/CMakeWindowsSystemConfig.cmake +++ b/Templates/CMakeWindowsSystemConfig.cmake @@ -6,8 +6,8 @@ SET (CMAKE_CXX_COMPILER VC++60 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_RELWITHDEBUGINFO "/MD /Zi /O2" CACHE STRING - "Flags used by the compiler during ReleaseWithDebugInfo builds") +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 diff --git a/Templates/DLLHeader.dsptemplate b/Templates/DLLHeader.dsptemplate index fd9100ee0..d403a821a 100644 --- a/Templates/DLLHeader.dsptemplate +++ b/Templates/DLLHeader.dsptemplate @@ -20,7 +20,7 @@ CFG=OUTPUT_LIBNAME - Win32 Debug !MESSAGE "OUTPUT_LIBNAME - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "OUTPUT_LIBNAME - Win32 MinSizeRel" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "OUTPUT_LIBNAME - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "OUTPUT_LIBNAME - Win32 ReleaseWithDebugInfo" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "OUTPUT_LIBNAME - Win32 RelWithDebInfo" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # ITK DSP Header file @@ -133,24 +133,24 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /stack:0x989680 /dll /machine:I386 # ADD LINK32 CM_OPTIMIZED_LIBRARIES CM_LIBRARIES kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /stack:0x989680 /dll /machine:I386 -!ELSEIF "$(CFG)" == "OUTPUT_LIBNAME - Win32 ReleaseWithDebugInfo" +!ELSEIF "$(CFG)" == "OUTPUT_LIBNAME - Win32 RelWithDebInfo" # PROP BASE Use_MFC CMAKE_MFC_FLAG # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "ReleaseWithDebugInfo" -# PROP BASE Intermediate_Dir "ReleaseWithDebugInfo" +# PROP BASE Output_Dir "RelWithDebInfo" +# PROP BASE Intermediate_Dir "RelWithDebInfo" # PROP BASE Target_Dir "" # PROP Use_MFC CMAKE_MFC_FLAG # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "LIBRARY_OUTPUT_PATHReleaseWithDebugInfo" -# PROP Intermediate_Dir "ReleaseWithDebugInfo" +# PROP Output_Dir "LIBRARY_OUTPUT_PATHRelWithDebInfo" +# PROP Intermediate_Dir "RelWithDebInfo" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OUTPUT_LIBNAME_EXPORTS" /FD /c # ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /c # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS" # ADD CPP CMAKE_CXX_FLAGS -# ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBUGINFO +# ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -170,4 +170,4 @@ LINK32=link.exe # Name "OUTPUT_LIBNAME - Win32 Release" # Name "OUTPUT_LIBNAME - Win32 Debug" # Name "OUTPUT_LIBNAME - Win32 MinSizeRel" -# Name "OUTPUT_LIBNAME - Win32 ReleaseWithDebugInfo" +# Name "OUTPUT_LIBNAME - Win32 RelWithDebInfo" diff --git a/Templates/EXEHeader.dsptemplate b/Templates/EXEHeader.dsptemplate index a015d972a..c5a1244b3 100644 --- a/Templates/EXEHeader.dsptemplate +++ b/Templates/EXEHeader.dsptemplate @@ -33,7 +33,7 @@ CFG=OUTPUT_LIBNAME - Win32 Debug !MESSAGE "OUTPUT_LIBNAME - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE "OUTPUT_LIBNAME - Win32 MinSizeRel" (based on "Win32 (x86) Application") !MESSAGE "OUTPUT_LIBNAME - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "OUTPUT_LIBNAME - Win32 ReleaseWithDebugInfo" (based on "Win32 (x86) Application") +!MESSAGE "OUTPUT_LIBNAME - Win32 RelWithDebInfo" (based on "Win32 (x86) Application") !MESSAGE # Begin Project @@ -129,23 +129,23 @@ LINK32=link.exe CM_MULTILINE_OPTIMIZED_LIBRARIES CM_MULTILINE_LIBRARIES -!ELSEIF "$(CFG)" == "OUTPUT_LIBNAME - Win32 ReleaseWithDebugInfo" +!ELSEIF "$(CFG)" == "OUTPUT_LIBNAME - Win32 RelWithDebInfo" # PROP BASE Use_MFC CMAKE_MFC_FLAG # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "ReleaseWithDebugInfo" -# PROP BASE Intermediate_Dir "ReleaseWithDebugInfo" +# PROP BASE Output_Dir "RelWithDebInfo" +# PROP BASE Intermediate_Dir "RelWithDebInfo" # PROP BASE Target_Dir "" # PROP Use_MFC CMAKE_MFC_FLAG # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHReleaseWithDebugInfo" -# PROP Intermediate_Dir "ReleaseWithDebugInfo" +# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHRelWithDebInfo" +# PROP Intermediate_Dir "RelWithDebInfo" # PROP Target_Dir "" # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS" # ADD CPP CMAKE_CXX_FLAGS -# ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBUGINFO +# ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -164,4 +164,4 @@ CM_MULTILINE_LIBRARIES # Name "OUTPUT_LIBNAME - Win32 Release" # Name "OUTPUT_LIBNAME - Win32 Debug" # Name "OUTPUT_LIBNAME - Win32 MinSizeRel" -# Name "OUTPUT_LIBNAME - Win32 ReleaseWithDebugInfo" +# Name "OUTPUT_LIBNAME - Win32 RelWithDebInfo" diff --git a/Templates/EXEWinHeader.dsptemplate b/Templates/EXEWinHeader.dsptemplate index 6e98c42f8..8d6b9b733 100644 --- a/Templates/EXEWinHeader.dsptemplate +++ b/Templates/EXEWinHeader.dsptemplate @@ -33,7 +33,7 @@ CFG=OUTPUT_LIBNAME - Win32 Debug !MESSAGE "OUTPUT_LIBNAME - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE "OUTPUT_LIBNAME - Win32 MinSizeRel" (based on "Win32 (x86) Application") !MESSAGE "OUTPUT_LIBNAME - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "OUTPUT_LIBNAME - Win32 ReleaseWithDebugInfo" (based on "Win32 (x86) Application") +!MESSAGE "OUTPUT_LIBNAME - Win32 RelWithDebInfo" (based on "Win32 (x86) Application") !MESSAGE # Begin Project @@ -132,23 +132,23 @@ LINK32=link.exe CM_MULTILINE_OPTIMIZED_LIBRARIES CM_MULTILINE_LIBRARIES -!ELSEIF "$(CFG)" == "OUTPUT_LIBNAME - Win32 ReleaseWithDebugInfo" +!ELSEIF "$(CFG)" == "OUTPUT_LIBNAME - Win32 RelWithDebInfo" # PROP BASE Use_MFC CMAKE_MFC_FLAG # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "ReleaseWithDebugInfo" -# PROP BASE Intermediate_Dir "ReleaseWithDebugInfo" +# PROP BASE Output_Dir "RelWithDebInfo" +# PROP BASE Intermediate_Dir "RelWithDebInfo" # PROP BASE Target_Dir "" # PROP Use_MFC CMAKE_MFC_FLAG # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHReleaseWithDebugInfo" -# PROP Intermediate_Dir "ReleaseWithDebugInfo" +# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHRelWithDebInfo" +# PROP Intermediate_Dir "RelWithDebInfo" # PROP Target_Dir "" # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c # ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS" # ADD CPP CMAKE_CXX_FLAGS -# ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBUGINFO +# ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -169,4 +169,4 @@ CM_MULTILINE_LIBRARIES # Name "OUTPUT_LIBNAME - Win32 Release" # Name "OUTPUT_LIBNAME - Win32 Debug" # Name "OUTPUT_LIBNAME - Win32 MinSizeRel" -# Name "OUTPUT_LIBNAME - Win32 ReleaseWithDebugInfo" +# Name "OUTPUT_LIBNAME - Win32 RelWithDebInfo" diff --git a/Templates/UtilityHeader.dsptemplate b/Templates/UtilityHeader.dsptemplate index 626f77760..61dbc5959 100644 --- a/Templates/UtilityHeader.dsptemplate +++ b/Templates/UtilityHeader.dsptemplate @@ -20,7 +20,7 @@ CFG=OUTPUT_LIBNAME - Win32 Debug !MESSAGE "OUTPUT_LIBNAME - Win32 Debug" (based on "Win32 (x86) Generic Project") !MESSAGE "OUTPUT_LIBNAME - Win32 MinSizeRel" (based on "Win32 (x86) Generic Project") !MESSAGE "OUTPUT_LIBNAME - Win32 Release" (based on "Win32 (x86) Generic Project") -!MESSAGE "OUTPUT_LIBNAME - Win32 ReleaseWithDebugInfo" (based on "Win32 (x86) Generic Project") +!MESSAGE "OUTPUT_LIBNAME - Win32 RelWithDebInfo" (based on "Win32 (x86) Generic Project") !MESSAGE # Begin Project @@ -68,17 +68,17 @@ MTL=midl.exe # PROP Intermediate_Dir "MinSizeRel" # PROP Target_Dir "" -!ELSEIF "$(CFG)" == "OUTPUT_LIBNAME - Win32 ReleaseWithDebugInfo" +!ELSEIF "$(CFG)" == "OUTPUT_LIBNAME - Win32 RelWithDebInfo" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "ReleaseWithDebugInfo" -# PROP BASE Intermediate_Dir "ReleaseWithDebugInfo" +# PROP BASE Output_Dir "RelWithDebInfo" +# PROP BASE Intermediate_Dir "RelWithDebInfo" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHReleaseWithDebugInfo" -# PROP Intermediate_Dir "ReleaseWithDebugInfo" +# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHRelWithDebInfo" +# PROP Intermediate_Dir "RelWithDebInfo" # PROP Target_Dir "" !ENDIF @@ -88,4 +88,4 @@ MTL=midl.exe # Name "OUTPUT_LIBNAME - Win32 Release" # Name "OUTPUT_LIBNAME - Win32 Debug" # Name "OUTPUT_LIBNAME - Win32 MinSizeRel" -# Name "OUTPUT_LIBNAME - Win32 ReleaseWithDebugInfo" +# Name "OUTPUT_LIBNAME - Win32 RelWithDebInfo" diff --git a/Templates/staticLibHeader.dsptemplate b/Templates/staticLibHeader.dsptemplate index 050a29263..f0b34f36b 100644 --- a/Templates/staticLibHeader.dsptemplate +++ b/Templates/staticLibHeader.dsptemplate @@ -33,7 +33,7 @@ CFG=OUTPUT_LIBNAME - Win32 Debug !MESSAGE "OUTPUT_LIBNAME - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "OUTPUT_LIBNAME - Win32 MinSizeRel" (based on "Win32 (x86) Static Library") !MESSAGE "OUTPUT_LIBNAME - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "OUTPUT_LIBNAME - Win32 ReleaseWithDebugInfo" (based on "Win32 (x86) Static Library") +!MESSAGE "OUTPUT_LIBNAME - Win32 RelWithDebInfo" (based on "Win32 (x86) Static Library") # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" @@ -118,23 +118,23 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "OUTPUT_LIBNAME - Win32 ReleaseWithDebugInfo" +!ELSEIF "$(CFG)" == "OUTPUT_LIBNAME - Win32 RelWithDebInfo" # PROP BASE Use_MFC CMAKE_MFC_FLAG # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "ReleaseWithDebugInfo" -# PROP BASE Intermediate_Dir "ReleaseWithDebugInfo" +# PROP BASE Output_Dir "RelWithDebInfo" +# PROP BASE Intermediate_Dir "RelWithDebInfo" # PROP BASE Target_Dir "" # PROP Use_MFC CMAKE_MFC_FLAG # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "LIBRARY_OUTPUT_PATHReleaseWithDebugInfo" -# PROP Intermediate_Dir "ReleaseWithDebugInfo" +# PROP Output_Dir "LIBRARY_OUTPUT_PATHRelWithDebInfo" +# PROP Intermediate_Dir "RelWithDebInfo" # PROP Target_Dir "" # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c # ADD CPP /nologo /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /FD /c # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS" # ADD CPP CMAKE_CXX_FLAGS -# ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBUGINFO +# ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -151,5 +151,5 @@ LIB32=link.exe -lib # Name "OUTPUT_LIBNAME - Win32 Release" # Name "OUTPUT_LIBNAME - Win32 Debug" # Name "OUTPUT_LIBNAME - Win32 MinSizeRel" -# Name "OUTPUT_LIBNAME - Win32 ReleaseWithDebugInfo" +# Name "OUTPUT_LIBNAME - Win32 RelWithDebInfo"