adding a "Release with debugging Info" build to CMake for NT

6 files changed, 139 insertions, 1 deletions

diff --git a/Templates/CMakeWindowsSystemConfig.cmake b/Templates/CMakeWindowsSystemConfig.cmake
index 9afd686330..c7a9854c54 100644
--- a/Templates/CMakeWindowsSystemConfig.cmake
+++ b/Templates/CMakeWindowsSystemConfig.cmake
@@ -8,6 +8,8 @@ SET (HAVE_UNISTD_H   1)
 SET (CXX  VC++60 )
 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_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 8fdf5fec8d..2cd06f4aa2 100644
--- a/Templates/DLLHeader.dsptemplate
+++ b/Templates/DLLHeader.dsptemplate
@@ -20,6 +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 

 

 # ITK DSP Header file

@@ -132,6 +133,36 @@ 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"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "ReleaseWithDebugInfo"

+# PROP BASE Intermediate_Dir "ReleaseWithDebugInfo"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "LIBRARY_OUTPUT_PATHReleaseWithDebugInfo"

+# PROP Intermediate_Dir "ReleaseWithDebugInfo"

+# 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 BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+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 /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 /dll /debug /machine:I386

+

+

 !ENDIF 

 

 # Begin Target

@@ -139,3 +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"

diff --git a/Templates/EXEHeader.dsptemplate b/Templates/EXEHeader.dsptemplate
index dbd679c881..dee7607158 100644
--- a/Templates/EXEHeader.dsptemplate
+++ b/Templates/EXEHeader.dsptemplate
@@ -33,6 +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 

 

 # Begin Project

@@ -128,6 +129,34 @@ LINK32=link.exe
 CM_MULTILINE_OPTIMIZED_LIBRARIES

 CM_MULTILINE_LIBRARIES

 

+!ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 ReleaseWithDebugInfo"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "ReleaseWithDebugInfo"

+# PROP BASE Intermediate_Dir "ReleaseWithDebugInfo"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHReleaseWithDebugInfo"

+# PROP Intermediate_Dir "ReleaseWithDebugInfo"

+# 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 BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+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  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 /subsystem:console /debug /machine:I386 /IGNORE:4089

+# ADD 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  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 /subsystem:console /debug /machine:I386 /IGNORE:4089

+CM_MULTILINE_OPTIMIZED_LIBRARIES

+CM_MULTILINE_LIBRARIES

+

 !ENDIF 

 

 # Begin Target

@@ -135,3 +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"

diff --git a/Templates/EXEWinHeader.dsptemplate b/Templates/EXEWinHeader.dsptemplate
index d481967932..34d7190fb1 100644
--- a/Templates/EXEWinHeader.dsptemplate
+++ b/Templates/EXEWinHeader.dsptemplate
@@ -33,6 +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 

 

 # Begin Project

@@ -69,7 +70,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 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 /subsystem:windows /machine:I386  /IGNORE:4089

-# ADD 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 /subsystem:windows /machine:I386  /IGNORE:4089

+# ADD 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 /subsystem:windows /debug /machine:I386  /IGNORE:4089

 CM_MULTILINE_OPTIMIZED_LIBRARIES

 CM_MULTILINE_LIBRARIES

 

@@ -131,6 +132,36 @@ LINK32=link.exe
 CM_MULTILINE_OPTIMIZED_LIBRARIES

 CM_MULTILINE_LIBRARIES

 

+!ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 ReleaseWithDebugInfo"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "ReleaseWithDebugInfo"

+# PROP BASE Intermediate_Dir "ReleaseWithDebugInfo"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHReleaseWithDebugInfo"

+# PROP Intermediate_Dir "ReleaseWithDebugInfo"

+# 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 BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+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 /subsystem:windows /machine:I386  /IGNORE:4089

+# ADD 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 /subsystem:windows /debug /machine:I386  /IGNORE:4089

+CM_MULTILINE_OPTIMIZED_LIBRARIES

+CM_MULTILINE_LIBRARIES

+

 !ENDIF 

 

 # Begin Target

@@ -138,3 +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"

diff --git a/Templates/UtilityHeader.dsptemplate b/Templates/UtilityHeader.dsptemplate
index fab0300197..626f777602 100644
--- a/Templates/UtilityHeader.dsptemplate
+++ b/Templates/UtilityHeader.dsptemplate
@@ -20,6 +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 

 

 # Begin Project

@@ -67,6 +68,19 @@ MTL=midl.exe
 # PROP Intermediate_Dir "MinSizeRel"

 # PROP Target_Dir ""

 

+!ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 ReleaseWithDebugInfo"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "ReleaseWithDebugInfo"

+# PROP BASE Intermediate_Dir "ReleaseWithDebugInfo"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "EXECUTABLE_OUTPUT_PATHReleaseWithDebugInfo"

+# PROP Intermediate_Dir "ReleaseWithDebugInfo"

+# PROP Target_Dir ""

+

 !ENDIF 

 

 # Begin Target

@@ -74,3 +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"

diff --git a/Templates/staticLibHeader.dsptemplate b/Templates/staticLibHeader.dsptemplate
index 533e3f89e2..883bd77793 100644
--- a/Templates/staticLibHeader.dsptemplate
+++ b/Templates/staticLibHeader.dsptemplate
@@ -33,6 +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")

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

@@ -117,6 +118,31 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo

 # ADD LIB32 /nologo

 

+!ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 ReleaseWithDebugInfo"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "ReleaseWithDebugInfo"

+# PROP BASE Intermediate_Dir "ReleaseWithDebugInfo"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "LIBRARY_OUTPUT_PATHReleaseWithDebugInfo"

+# PROP Intermediate_Dir "ReleaseWithDebugInfo"

+# 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 BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo

+# ADD LIB32 /nologo

 

 !ENDIF 

 

@@ -125,4 +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"