Home Explore Help
Register Sign In
Apq
/
CMake
mirror of https://github.com/Kitware/CMake.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

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

Ian Scott 24 years ago
parent
d9e7be545f
commit
331c517eeb
7 changed files with 43 additions and 43 deletions
Split View Show Diff Stats
  1. 2 2
      Source/cmDSPWriter.cxx
  2. 2 2
      Templates/CMakeWindowsSystemConfig.cmake
  3. 8 8
      Templates/DLLHeader.dsptemplate
  4. 8 8
      Templates/EXEHeader.dsptemplate
  5. 8 8
      Templates/EXEWinHeader.dsptemplate
  6. 7 7
      Templates/UtilityHeader.dsptemplate
  7. 8 8
      Templates/staticLibHeader.dsptemplate

+ 2 - 2
Source/cmDSPWriter.cxx
View File 

@@ -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->

+ 2 - 2
Templates/CMakeWindowsSystemConfig.cmake
View File 

@@ -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

+ 8 - 8
Templates/DLLHeader.dsptemplate
View File 

@@ -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"

+ 8 - 8
Templates/EXEHeader.dsptemplate
View File 

@@ -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"

+ 8 - 8
Templates/EXEWinHeader.dsptemplate
View File 

@@ -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"

+ 7 - 7
Templates/UtilityHeader.dsptemplate
View File 

@@ -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"

+ 8 - 8
Templates/staticLibHeader.dsptemplate
View File 

@@ -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"