[cmake-commits] alex committed DLLHeader.dsptemplate 1.26 1.27 EXEHeader.dsptemplate 1.22 1.23 EXEWinHeader.dsptemplate 1.21 1.22 UtilityHeader.dsptemplate 1.10 1.11 staticLibHeader.dsptemplate 1.20 1.21

cmake-commits at cmake.org cmake-commits at cmake.org
Wed May 9 08:25:47 EDT 2007 

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

Modified Files:
	DLLHeader.dsptemplate EXEHeader.dsptemplate 
	EXEWinHeader.dsptemplate UtilityHeader.dsptemplate 
	staticLibHeader.dsptemplate 
Log Message:

ENH: now target names can be used in add_custom_command() and
add_custom_target() as COMMAND, and cmake will recognize them and replace
them with the actual output path of these executables. Also the dependency
will be added automatically. Test included.
ENH: moved TraceVSDependencies() to the end of GlobalGenerator::Configure(),
so it is done now in one central place

Alex


Index: EXEWinHeader.dsptemplate
===================================================================
RCS file: /cvsroot/CMake/CMake/Templates/EXEWinHeader.dsptemplate,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- EXEWinHeader.dsptemplate	9 Mar 2007 21:25:16 -0000	1.21
+++ EXEWinHeader.dsptemplate	9 May 2007 12:25:45 -0000	1.22
@@ -74,7 +74,7 @@
 # ADD LINK32 /out:"OUTPUT_DIRECTORY\Release\OUTPUT_NAME_RELEASE"
 CM_MULTILINE_OPTIONS_RELEASE
 
-CMAKE_CUSTOM_RULE_CODE
+CMAKE_CUSTOM_RULE_CODE_RELEASE
 
 !ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 Debug"
 
@@ -106,7 +106,7 @@
 # ADD LINK32 /out:"OUTPUT_DIRECTORY\Debug\OUTPUT_NAME_DEBUG"
 CM_MULTILINE_OPTIONS_DEBUG
 
-CMAKE_CUSTOM_RULE_CODE
+CMAKE_CUSTOM_RULE_CODE_DEBUG
 
 !ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 MinSizeRel"
 # PROP BASE Use_MFC CMAKE_MFC_FLAG
@@ -135,7 +135,7 @@
 # ADD LINK32 /out:"OUTPUT_DIRECTORY\MinSizeRel\OUTPUT_NAME_MINSIZEREL"
 CM_MULTILINE_OPTIONS_MINSIZEREL
 
-CMAKE_CUSTOM_RULE_CODE
+CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
 
 !ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 RelWithDebInfo"
 
@@ -167,7 +167,7 @@
 # ADD LINK32 /out:"OUTPUT_DIRECTORY\RelWithDebInfo\OUTPUT_NAME_RELWITHDEBINFO"
 CM_MULTILINE_OPTIONS_RELWITHDEBINFO
 
-CMAKE_CUSTOM_RULE_CODE
+CMAKE_CUSTOM_RULE_CODE_RELWITHDEBINFO
 
 !ENDIF 
 

Index: DLLHeader.dsptemplate
===================================================================
RCS file: /cvsroot/CMake/CMake/Templates/DLLHeader.dsptemplate,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- DLLHeader.dsptemplate	9 Mar 2007 21:25:16 -0000	1.26
+++ DLLHeader.dsptemplate	9 May 2007 12:25:45 -0000	1.27
@@ -74,7 +74,7 @@
 # ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /machine:I386 /out:"OUTPUT_DIRECTORY\Release/OUTPUT_NAME_RELEASE" TARGET_IMPLIB_FLAG_RELEASE
 CM_MULTILINE_OPTIONS_RELEASE
 
-CMAKE_CUSTOM_RULE_CODE
+CMAKE_CUSTOM_RULE_CODE_RELEASE
 
 !ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 Debug"
 
@@ -106,7 +106,7 @@
 # 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
 
-CMAKE_CUSTOM_RULE_CODE
+CMAKE_CUSTOM_RULE_CODE_DEBUG
 
 !ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 MinSizeRel"
 
@@ -140,7 +140,7 @@
 # ADD LINK32 /nologo /dll TARGET_VERSION_FLAG /machine:I386 /out:"OUTPUT_DIRECTORY\MinSizeRel/OUTPUT_NAME_MINSIZEREL" TARGET_IMPLIB_FLAG_MINSIZEREL
 CM_MULTILINE_OPTIONS_MINSIZEREL
 
-CMAKE_CUSTOM_RULE_CODE
+CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
 
 !ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 RelWithDebInfo"
 
@@ -172,7 +172,7 @@
 # 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
 
-CMAKE_CUSTOM_RULE_CODE
+CMAKE_CUSTOM_RULE_CODE_RELWITHDEBINFO
 
 !ENDIF 
 

Index: UtilityHeader.dsptemplate
===================================================================
RCS file: /cvsroot/CMake/CMake/Templates/UtilityHeader.dsptemplate,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- UtilityHeader.dsptemplate	9 Mar 2007 21:25:16 -0000	1.10
+++ UtilityHeader.dsptemplate	9 May 2007 12:25:45 -0000	1.11
@@ -42,7 +42,7 @@
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 
-CMAKE_CUSTOM_RULE_CODE
+CMAKE_CUSTOM_RULE_CODE_RELEASE
 
 !ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 Debug"
 
@@ -57,7 +57,7 @@
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 
-CMAKE_CUSTOM_RULE_CODE
+CMAKE_CUSTOM_RULE_CODE_DEBUG
 
 !ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 MinSizeRel"
 
@@ -72,7 +72,7 @@
 # PROP Intermediate_Dir "MinSizeRel"
 # PROP Target_Dir ""
 
-CMAKE_CUSTOM_RULE_CODE
+CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
 
 !ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 RelWithDebInfo"
 
@@ -87,7 +87,7 @@
 # PROP Intermediate_Dir "RelWithDebInfo"
 # PROP Target_Dir ""
 
-CMAKE_CUSTOM_RULE_CODE
+CMAKE_CUSTOM_RULE_CODE_RELWITHDEBINFO
 
 !ENDIF 
 

Index: staticLibHeader.dsptemplate
===================================================================
RCS file: /cvsroot/CMake/CMake/Templates/staticLibHeader.dsptemplate,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- staticLibHeader.dsptemplate	9 Mar 2007 21:25:16 -0000	1.20
+++ staticLibHeader.dsptemplate	9 May 2007 12:25:45 -0000	1.21
@@ -67,7 +67,7 @@
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"OUTPUT_DIRECTORY\Release/OUTPUT_NAME_RELEASE" CM_STATIC_LIB_ARGS
 
-CMAKE_CUSTOM_RULE_CODE
+CMAKE_CUSTOM_RULE_CODE_RELEASE
 
 !ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 Debug"
 
@@ -95,7 +95,7 @@
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"OUTPUT_DIRECTORY\Debug/OUTPUT_NAME_DEBUG" CM_STATIC_LIB_ARGS
 
-CMAKE_CUSTOM_RULE_CODE
+CMAKE_CUSTOM_RULE_CODE_DEBUG
 
 !ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 MinSizeRel"
 
@@ -124,7 +124,7 @@
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"OUTPUT_DIRECTORY\MinSizeRel/OUTPUT_NAME_MINSIZEREL" CM_STATIC_LIB_ARGS
 
-CMAKE_CUSTOM_RULE_CODE
+CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
 
 !ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 RelWithDebInfo"
 
@@ -152,7 +152,7 @@
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"OUTPUT_DIRECTORY\RelWithDebInfo/OUTPUT_NAME_RELWITHDEBINFO" CM_STATIC_LIB_ARGS
 
-CMAKE_CUSTOM_RULE_CODE
+CMAKE_CUSTOM_RULE_CODE_RELWITHDEBINFO
 
 !ENDIF 
 

Index: EXEHeader.dsptemplate
===================================================================
RCS file: /cvsroot/CMake/CMake/Templates/EXEHeader.dsptemplate,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- EXEHeader.dsptemplate	19 Mar 2007 14:00:36 -0000	1.22
+++ EXEHeader.dsptemplate	9 May 2007 12:25:45 -0000	1.23
@@ -72,7 +72,7 @@
 # ADD LINK32 /out:"OUTPUT_DIRECTORY\Release\OUTPUT_NAME_RELEASE" TARGET_IMPLIB_FLAG_RELEASE
 CM_MULTILINE_OPTIONS_RELEASE
 
-CMAKE_CUSTOM_RULE_CODE
+CMAKE_CUSTOM_RULE_CODE_RELEASE
 
 !ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 Debug"
 
@@ -104,7 +104,7 @@
 # ADD LINK32 /out:"OUTPUT_DIRECTORY\Debug\OUTPUT_NAME_DEBUG" TARGET_IMPLIB_FLAG_DEBUG
 CM_MULTILINE_OPTIONS_DEBUG
 
-CMAKE_CUSTOM_RULE_CODE
+CMAKE_CUSTOM_RULE_CODE_DEBUG
 
 !ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 MinSizeRel"
 # PROP BASE Use_MFC CMAKE_MFC_FLAG
@@ -133,7 +133,7 @@
 # ADD LINK32 /out:"OUTPUT_DIRECTORY\MinSizeRel\OUTPUT_NAME_MINSIZEREL" TARGET_IMPLIB_FLAG_MINSIZEREL
 CM_MULTILINE_OPTIONS_MINSIZEREL
 
-CMAKE_CUSTOM_RULE_CODE
+CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
 
 !ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 RelWithDebInfo"
 
@@ -163,7 +163,7 @@
 # ADD LINK32 /out:"OUTPUT_DIRECTORY\RelWithDebInfo\OUTPUT_NAME_RELWITHDEBINFO" TARGET_IMPLIB_FLAG_RELWITHDEBINFO
 CM_MULTILINE_OPTIONS_RELWITHDEBINFO
 
-CMAKE_CUSTOM_RULE_CODE
+CMAKE_CUSTOM_RULE_CODE_RELWITHDEBINFO
 
 !ENDIF

More information about the Cmake-commits mailing list