[Cmake-commits] [cmake-commits] king committed DLLHeader.dsptemplate 1.30 1.31 EXEHeader.dsptemplate 1.25 1.26 EXEWinHeader.dsptemplate 1.25 1.26 staticLibHeader.dsptemplate 1.22 1.23

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Oct 28 12:18:57 EDT 2009 

Update of /cvsroot/CMake/CMake/Templates
In directory public:/mounts/ram/cvs-serv22556/Templates

Modified Files:
	DLLHeader.dsptemplate EXEHeader.dsptemplate 
	EXEWinHeader.dsptemplate staticLibHeader.dsptemplate 
Log Message:
Use per-config output dir in VS 6 templates

This commit removes use of configuration-less cmTarget::GetDirectory()
by the VS 6 generator (except for compatibility with user templates).
We replace OUTPUT_DIRECTORY_<CONFIG> tokens in the templates using the
per-configuration result of cmTarget::GetDirectory(config).


Index: EXEWinHeader.dsptemplate
===================================================================
RCS file: /cvsroot/CMake/CMake/Templates/EXEWinHeader.dsptemplate,v
retrieving revision 1.25
retrieving revision 1.26
diff -C 2 -d -r1.25 -r1.26
*** EXEWinHeader.dsptemplate	25 Sep 2009 19:46:37 -0000	1.25
--- EXEWinHeader.dsptemplate	28 Oct 2009 16:18:54 -0000	1.26
***************
*** 54,58 ****
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "OUTPUT_DIRECTORY\Release"
  # PROP Intermediate_Dir "Release"
  # PROP Target_Dir ""
--- 54,58 ----
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "OUTPUT_DIRECTORY_RELEASE"
  # PROP Intermediate_Dir "Release"
  # PROP Target_Dir ""
***************
*** 74,78 ****
  # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386  /IGNORE:4089
  # ADD LINK32  /nologo /subsystem:windows /machine:I386  /IGNORE:4089 TARGET_VERSION_FLAG
! # ADD LINK32 /out:"OUTPUT_DIRECTORY\Release\OUTPUT_NAME_RELEASE" TARGET_IMPLIB_FLAG_RELEASE
  CM_MULTILINE_OPTIONS_RELEASE
  
--- 74,78 ----
  # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386  /IGNORE:4089
  # ADD LINK32  /nologo /subsystem:windows /machine:I386  /IGNORE:4089 TARGET_VERSION_FLAG
! # ADD LINK32 /out:"OUTPUT_DIRECTORY_RELEASE\OUTPUT_NAME_RELEASE" TARGET_IMPLIB_FLAG_RELEASE
  CM_MULTILINE_OPTIONS_RELEASE
  
***************
*** 88,92 ****
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 1
! # PROP Output_Dir "OUTPUT_DIRECTORY\Debug"
  # PROP Intermediate_Dir "Debug"
  # PROP Target_Dir ""
--- 88,92 ----
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 1
! # PROP Output_Dir "OUTPUT_DIRECTORY_DEBUG"
  # PROP Intermediate_Dir "Debug"
  # PROP Target_Dir ""
***************
*** 108,112 ****
  # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /IGNORE:4089
  # ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /IGNORE:4089 TARGET_VERSION_FLAG
! # ADD LINK32 /out:"OUTPUT_DIRECTORY\Debug\OUTPUT_NAME_DEBUG" TARGET_IMPLIB_FLAG_DEBUG
  CM_MULTILINE_OPTIONS_DEBUG
  
--- 108,112 ----
  # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /IGNORE:4089
  # ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /IGNORE:4089 TARGET_VERSION_FLAG
! # ADD LINK32 /out:"OUTPUT_DIRECTORY_DEBUG\OUTPUT_NAME_DEBUG" TARGET_IMPLIB_FLAG_DEBUG
  CM_MULTILINE_OPTIONS_DEBUG
  
***************
*** 121,125 ****
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "OUTPUT_DIRECTORY\MinSizeRel"
  # PROP Intermediate_Dir "MinSizeRel"
  # PROP Target_Dir ""
--- 121,125 ----
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "OUTPUT_DIRECTORY_MINSIZEREL"
  # PROP Intermediate_Dir "MinSizeRel"
  # PROP Target_Dir ""
***************
*** 139,143 ****
  # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 /pdbtype:sept /IGNORE:4089
  # ADD LINK32 /nologo /subsystem:windows  /machine:I386 /pdbtype:sept /IGNORE:4089 TARGET_VERSION_FLAG
! # ADD LINK32 /out:"OUTPUT_DIRECTORY\MinSizeRel\OUTPUT_NAME_MINSIZEREL" TARGET_IMPLIB_FLAG_MINSIZEREL
  CM_MULTILINE_OPTIONS_MINSIZEREL
  
--- 139,143 ----
  # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 /pdbtype:sept /IGNORE:4089
  # ADD LINK32 /nologo /subsystem:windows  /machine:I386 /pdbtype:sept /IGNORE:4089 TARGET_VERSION_FLAG
! # ADD LINK32 /out:"OUTPUT_DIRECTORY_MINSIZEREL\OUTPUT_NAME_MINSIZEREL" TARGET_IMPLIB_FLAG_MINSIZEREL
  CM_MULTILINE_OPTIONS_MINSIZEREL
  
***************
*** 153,157 ****
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "OUTPUT_DIRECTORY\RelWithDebInfo"
  # PROP Intermediate_Dir "RelWithDebInfo"
  # PROP Target_Dir ""
--- 153,157 ----
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "OUTPUT_DIRECTORY_RELWITHDEBINFO"
  # PROP Intermediate_Dir "RelWithDebInfo"
  # PROP Target_Dir ""
***************
*** 173,177 ****
  # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386  /IGNORE:4089
  # ADD LINK32 /nologo /subsystem:windows /debug /machine:I386  /IGNORE:4089 TARGET_VERSION_FLAG
! # ADD LINK32 /out:"OUTPUT_DIRECTORY\RelWithDebInfo\OUTPUT_NAME_RELWITHDEBINFO" TARGET_IMPLIB_FLAG_RELWITHDEBINFO
  CM_MULTILINE_OPTIONS_RELWITHDEBINFO
  
--- 173,177 ----
  # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386  /IGNORE:4089
  # ADD LINK32 /nologo /subsystem:windows /debug /machine:I386  /IGNORE:4089 TARGET_VERSION_FLAG
! # ADD LINK32 /out:"OUTPUT_DIRECTORY_RELWITHDEBINFO\OUTPUT_NAME_RELWITHDEBINFO" TARGET_IMPLIB_FLAG_RELWITHDEBINFO
  CM_MULTILINE_OPTIONS_RELWITHDEBINFO
  

Index: DLLHeader.dsptemplate
===================================================================
RCS file: /cvsroot/CMake/CMake/Templates/DLLHeader.dsptemplate,v
retrieving revision 1.30
retrieving revision 1.31
diff -C 2 -d -r1.30 -r1.31
*** DLLHeader.dsptemplate	3 Dec 2008 20:35:35 -0000	1.30
--- DLLHeader.dsptemplate	28 Oct 2009 16:18:54 -0000	1.31
***************
*** 54,58 ****
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "OUTPUT_DIRECTORY\Release"
  # PROP Intermediate_Dir "Release"
  # PROP Ignore_Export_Lib 0
--- 54,58 ----
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "OUTPUT_DIRECTORY_RELEASE"
  # PROP Intermediate_Dir "Release"
  # PROP Ignore_Export_Lib 0
***************
*** 74,78 ****
  LINK32=link.exe
  # ADD BASE LINK32 /nologo /dll /machine:I386
! # ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /machine:I386 /out:"OUTPUT_DIRECTORY\Release/OUTPUT_NAME_RELEASE" TARGET_IMPLIB_FLAG_RELEASE
  CM_MULTILINE_OPTIONS_RELEASE
  
--- 74,78 ----
  LINK32=link.exe
  # ADD BASE LINK32 /nologo /dll /machine:I386
! # ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /machine:I386 /out:"OUTPUT_DIRECTORY_RELEASE/OUTPUT_NAME_RELEASE" TARGET_IMPLIB_FLAG_RELEASE
  CM_MULTILINE_OPTIONS_RELEASE
  
***************
*** 88,92 ****
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 1
! # PROP Output_Dir "OUTPUT_DIRECTORY\Debug"
  # PROP Intermediate_Dir "Debug"
  # PROP Ignore_Export_Lib 0
--- 88,92 ----
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 1
! # PROP Output_Dir "OUTPUT_DIRECTORY_DEBUG"
  # PROP Intermediate_Dir "Debug"
  # PROP Ignore_Export_Lib 0
***************
*** 108,112 ****
  LINK32=link.exe
  # ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /debug /machine:I386 /out:"OUTPUT_DIRECTORY\Debug/OUTPUT_NAME_DEBUG" /pdbtype:sept TARGET_IMPLIB_FLAG_DEBUG
  CM_MULTILINE_OPTIONS_DEBUG
  
--- 108,112 ----
  LINK32=link.exe
  # ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /debug /machine:I386 /out:"OUTPUT_DIRECTORY_DEBUG/OUTPUT_NAME_DEBUG" /pdbtype:sept TARGET_IMPLIB_FLAG_DEBUG
  CM_MULTILINE_OPTIONS_DEBUG
  
***************
*** 123,127 ****
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "OUTPUT_DIRECTORY\MinSizeRel"
  # PROP Intermediate_Dir "MinSizeRel"
  # PROP Ignore_Export_Lib 0
--- 123,127 ----
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "OUTPUT_DIRECTORY_MINSIZEREL"
  # PROP Intermediate_Dir "MinSizeRel"
  # PROP Ignore_Export_Lib 0
***************
*** 144,148 ****
  LINK32=link.exe
  # ADD BASE LINK32  /nologo /dll /machine:I386 
! # ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /machine:I386 /out:"OUTPUT_DIRECTORY\MinSizeRel/OUTPUT_NAME_MINSIZEREL" TARGET_IMPLIB_FLAG_MINSIZEREL
  CM_MULTILINE_OPTIONS_MINSIZEREL
  
--- 144,148 ----
  LINK32=link.exe
  # ADD BASE LINK32  /nologo /dll /machine:I386 
! # ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /machine:I386 /out:"OUTPUT_DIRECTORY_MINSIZEREL/OUTPUT_NAME_MINSIZEREL" TARGET_IMPLIB_FLAG_MINSIZEREL
  CM_MULTILINE_OPTIONS_MINSIZEREL
  
***************
*** 158,162 ****
  # PROP Use_MFC CMAKE_MFC_FLAG         
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "OUTPUT_DIRECTORY\RelWithDebInfo"
  # PROP Intermediate_Dir "RelWithDebInfo"
  # PROP Ignore_Export_Lib 0
--- 158,162 ----
  # PROP Use_MFC CMAKE_MFC_FLAG         
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "OUTPUT_DIRECTORY_RELWITHDEBINFO"
  # PROP Intermediate_Dir "RelWithDebInfo"
  # PROP Ignore_Export_Lib 0
***************
*** 178,182 ****
  LINK32=link.exe
  # ADD BASE LINK32 /nologo /dll /machine:I386 /pdbtype:sept
! # ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /debug /machine:I386 /pdbtype:sept /out:"OUTPUT_DIRECTORY\RelWithDebInfo/OUTPUT_NAME_RELWITHDEBINFO" TARGET_IMPLIB_FLAG_RELWITHDEBINFO
  CM_MULTILINE_OPTIONS_RELWITHDEBINFO
  
--- 178,182 ----
  LINK32=link.exe
  # ADD BASE LINK32 /nologo /dll /machine:I386 /pdbtype:sept
! # ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /debug /machine:I386 /pdbtype:sept /out:"OUTPUT_DIRECTORY_RELWITHDEBINFO/OUTPUT_NAME_RELWITHDEBINFO" TARGET_IMPLIB_FLAG_RELWITHDEBINFO
  CM_MULTILINE_OPTIONS_RELWITHDEBINFO
  

Index: staticLibHeader.dsptemplate
===================================================================
RCS file: /cvsroot/CMake/CMake/Templates/staticLibHeader.dsptemplate,v
retrieving revision 1.22
retrieving revision 1.23
diff -C 2 -d -r1.22 -r1.23
*** staticLibHeader.dsptemplate	3 Dec 2008 20:35:35 -0000	1.22
--- staticLibHeader.dsptemplate	28 Oct 2009 16:18:55 -0000	1.23
***************
*** 51,55 ****
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "OUTPUT_DIRECTORY\Release"
  # PROP Intermediate_Dir "Release"
  # PROP Target_Dir ""
--- 51,55 ----
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "OUTPUT_DIRECTORY_RELEASE"
  # PROP Intermediate_Dir "Release"
  # PROP Target_Dir ""
***************
*** 68,72 ****
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
! # ADD LIB32 /nologo /out:"OUTPUT_DIRECTORY\Release/OUTPUT_NAME_RELEASE" CM_STATIC_LIB_ARGS
  
  CMAKE_CUSTOM_RULE_CODE_RELEASE
--- 68,72 ----
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
! # ADD LIB32 /nologo /out:"OUTPUT_DIRECTORY_RELEASE/OUTPUT_NAME_RELEASE" CM_STATIC_LIB_ARGS
  
  CMAKE_CUSTOM_RULE_CODE_RELEASE
***************
*** 81,85 ****
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 1
! # PROP Output_Dir "OUTPUT_DIRECTORY\Debug"
  # PROP Intermediate_Dir "Debug"
  # PROP Target_Dir ""
--- 81,85 ----
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 1
! # PROP Output_Dir "OUTPUT_DIRECTORY_DEBUG"
  # PROP Intermediate_Dir "Debug"
  # PROP Target_Dir ""
***************
*** 98,102 ****
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
! # ADD LIB32 /nologo /out:"OUTPUT_DIRECTORY\Debug/OUTPUT_NAME_DEBUG" CM_STATIC_LIB_ARGS
  
  CMAKE_CUSTOM_RULE_CODE_DEBUG
--- 98,102 ----
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
! # ADD LIB32 /nologo /out:"OUTPUT_DIRECTORY_DEBUG/OUTPUT_NAME_DEBUG" CM_STATIC_LIB_ARGS
  
  CMAKE_CUSTOM_RULE_CODE_DEBUG
***************
*** 111,115 ****
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "OUTPUT_DIRECTORY\MinSizeRel"
  # PROP Intermediate_Dir "MinSizeRel"
  # PROP Ignore_Export_Lib 0
--- 111,115 ----
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "OUTPUT_DIRECTORY_MINSIZEREL"
  # PROP Intermediate_Dir "MinSizeRel"
  # PROP Ignore_Export_Lib 0
***************
*** 129,133 ****
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
! # ADD LIB32 /nologo /out:"OUTPUT_DIRECTORY\MinSizeRel/OUTPUT_NAME_MINSIZEREL" CM_STATIC_LIB_ARGS
  
  CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
--- 129,133 ----
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
! # ADD LIB32 /nologo /out:"OUTPUT_DIRECTORY_MINSIZEREL/OUTPUT_NAME_MINSIZEREL" CM_STATIC_LIB_ARGS
  
  CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
***************
*** 142,146 ****
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "OUTPUT_DIRECTORY\RelWithDebInfo"
  # PROP Intermediate_Dir "RelWithDebInfo"
  # PROP Target_Dir ""
--- 142,146 ----
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "OUTPUT_DIRECTORY_RELWITHDEBINFO"
  # PROP Intermediate_Dir "RelWithDebInfo"
  # PROP Target_Dir ""
***************
*** 159,163 ****
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
! # ADD LIB32 /nologo /out:"OUTPUT_DIRECTORY\RelWithDebInfo/OUTPUT_NAME_RELWITHDEBINFO" CM_STATIC_LIB_ARGS
  
  CMAKE_CUSTOM_RULE_CODE_RELWITHDEBINFO
--- 159,163 ----
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
! # ADD LIB32 /nologo /out:"OUTPUT_DIRECTORY_RELWITHDEBINFO/OUTPUT_NAME_RELWITHDEBINFO" CM_STATIC_LIB_ARGS
  
  CMAKE_CUSTOM_RULE_CODE_RELWITHDEBINFO

Index: EXEHeader.dsptemplate
===================================================================
RCS file: /cvsroot/CMake/CMake/Templates/EXEHeader.dsptemplate,v
retrieving revision 1.25
retrieving revision 1.26
diff -C 2 -d -r1.25 -r1.26
*** EXEHeader.dsptemplate	3 Dec 2008 20:35:35 -0000	1.25
--- EXEHeader.dsptemplate	28 Oct 2009 16:18:54 -0000	1.26
***************
*** 54,58 ****
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "OUTPUT_DIRECTORY\Release"
  # PROP Intermediate_Dir "Release"
  # PROP Target_Dir ""
--- 54,58 ----
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "OUTPUT_DIRECTORY_RELEASE"
  # PROP Intermediate_Dir "Release"
  # PROP Target_Dir ""
***************
*** 72,76 ****
  # ADD BASE LINK32  /nologo /subsystem:console /machine:I386 /IGNORE:4089
  # ADD LINK32  /nologo /subsystem:console /machine:I386 /IGNORE:4089 TARGET_VERSION_FLAG
! # ADD LINK32 /out:"OUTPUT_DIRECTORY\Release\OUTPUT_NAME_RELEASE" TARGET_IMPLIB_FLAG_RELEASE
  CM_MULTILINE_OPTIONS_RELEASE
  
--- 72,76 ----
  # ADD BASE LINK32  /nologo /subsystem:console /machine:I386 /IGNORE:4089
  # ADD LINK32  /nologo /subsystem:console /machine:I386 /IGNORE:4089 TARGET_VERSION_FLAG
! # ADD LINK32 /out:"OUTPUT_DIRECTORY_RELEASE\OUTPUT_NAME_RELEASE" TARGET_IMPLIB_FLAG_RELEASE
  CM_MULTILINE_OPTIONS_RELEASE
  
***************
*** 86,90 ****
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 1
! # PROP Output_Dir "OUTPUT_DIRECTORY\Debug"
  # PROP Intermediate_Dir "Debug"
  # PROP Target_Dir ""
--- 86,90 ----
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 1
! # PROP Output_Dir "OUTPUT_DIRECTORY_DEBUG"
  # PROP Intermediate_Dir "Debug"
  # PROP Target_Dir ""
***************
*** 106,110 ****
  # ADD BASE LINK32  /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /IGNORE:4089
  # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /IGNORE:4089 TARGET_VERSION_FLAG
! # ADD LINK32 /out:"OUTPUT_DIRECTORY\Debug\OUTPUT_NAME_DEBUG" TARGET_IMPLIB_FLAG_DEBUG
  CM_MULTILINE_OPTIONS_DEBUG
  
--- 106,110 ----
  # ADD BASE LINK32  /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /IGNORE:4089
  # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /IGNORE:4089 TARGET_VERSION_FLAG
! # ADD LINK32 /out:"OUTPUT_DIRECTORY_DEBUG\OUTPUT_NAME_DEBUG" TARGET_IMPLIB_FLAG_DEBUG
  CM_MULTILINE_OPTIONS_DEBUG
  
***************
*** 119,123 ****
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "OUTPUT_DIRECTORY\MinSizeRel"
  # PROP Intermediate_Dir "MinSizeRel"
  # PROP Target_Dir ""
--- 119,123 ----
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "OUTPUT_DIRECTORY_MINSIZEREL"
  # PROP Intermediate_Dir "MinSizeRel"
  # PROP Target_Dir ""
***************
*** 137,141 ****
  # ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089
  # ADD LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089 TARGET_VERSION_FLAG
! # ADD LINK32 /out:"OUTPUT_DIRECTORY\MinSizeRel\OUTPUT_NAME_MINSIZEREL" TARGET_IMPLIB_FLAG_MINSIZEREL
  CM_MULTILINE_OPTIONS_MINSIZEREL
  
--- 137,141 ----
  # ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089
  # ADD LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089 TARGET_VERSION_FLAG
! # ADD LINK32 /out:"OUTPUT_DIRECTORY_MINSIZEREL\OUTPUT_NAME_MINSIZEREL" TARGET_IMPLIB_FLAG_MINSIZEREL
  CM_MULTILINE_OPTIONS_MINSIZEREL
  
***************
*** 151,155 ****
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "OUTPUT_DIRECTORY\RelWithDebInfo"
  # PROP Intermediate_Dir "RelWithDebInfo"
  # PROP Target_Dir ""
--- 151,155 ----
  # PROP Use_MFC CMAKE_MFC_FLAG
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "OUTPUT_DIRECTORY_RELWITHDEBINFO"
  # PROP Intermediate_Dir "RelWithDebInfo"
  # PROP Target_Dir ""
***************
*** 169,173 ****
  # ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /IGNORE:4089
  # ADD LINK32  /nologo /subsystem:console /debug /machine:I386 /IGNORE:4089 TARGET_VERSION_FLAG
! # ADD LINK32 /out:"OUTPUT_DIRECTORY\RelWithDebInfo\OUTPUT_NAME_RELWITHDEBINFO" TARGET_IMPLIB_FLAG_RELWITHDEBINFO
  CM_MULTILINE_OPTIONS_RELWITHDEBINFO
  
--- 169,173 ----
  # ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /IGNORE:4089
  # ADD LINK32  /nologo /subsystem:console /debug /machine:I386 /IGNORE:4089 TARGET_VERSION_FLAG
! # ADD LINK32 /out:"OUTPUT_DIRECTORY_RELWITHDEBINFO\OUTPUT_NAME_RELWITHDEBINFO" TARGET_IMPLIB_FLAG_RELWITHDEBINFO
  CM_MULTILINE_OPTIONS_RELWITHDEBINFO

More information about the Cmake-commits mailing list