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

5 files changed, 20 insertions, 20 deletions

diff --git a/Templates/DLLHeader.dsptemplate b/Templates/DLLHeader.dsptemplate
index 5b31e08e87..29ae8e7d7e 100644
--- a/Templates/DLLHeader.dsptemplate
+++ b/Templates/DLLHeader.dsptemplate
@@ -74,7 +74,7 @@ LINK32=link.exe
 # 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 @@ LINK32=link.exe
 # 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 @@ LINK32=link.exe
 # 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 @@ LINK32=link.exe
 # 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 

 

diff --git a/Templates/EXEHeader.dsptemplate b/Templates/EXEHeader.dsptemplate
index 90faf7784a..57c5b5f0bf 100644
--- a/Templates/EXEHeader.dsptemplate
+++ b/Templates/EXEHeader.dsptemplate
@@ -72,7 +72,7 @@ LINK32=link.exe
 # 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 @@ LINK32=link.exe
 # 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 @@ LINK32=link.exe
 # 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 @@ LINK32=link.exe
 # 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 

 

diff --git a/Templates/EXEWinHeader.dsptemplate b/Templates/EXEWinHeader.dsptemplate
index 51c7f155a9..5ca0f91a89 100644
--- a/Templates/EXEWinHeader.dsptemplate
+++ b/Templates/EXEWinHeader.dsptemplate
@@ -74,7 +74,7 @@ LINK32=link.exe
 # 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 @@ LINK32=link.exe
 # 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 @@ LINK32=link.exe
 # 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 @@ LINK32=link.exe
 # ADD LINK32 /out:"OUTPUT_DIRECTORY\RelWithDebInfo\OUTPUT_NAME_RELWITHDEBINFO"

 CM_MULTILINE_OPTIONS_RELWITHDEBINFO

 

-CMAKE_CUSTOM_RULE_CODE

+CMAKE_CUSTOM_RULE_CODE_RELWITHDEBINFO

 

 !ENDIF 

 

diff --git a/Templates/UtilityHeader.dsptemplate b/Templates/UtilityHeader.dsptemplate
index 681ba74e8f..4ad57d551c 100644
--- a/Templates/UtilityHeader.dsptemplate
+++ b/Templates/UtilityHeader.dsptemplate
@@ -42,7 +42,7 @@ MTL=midl.exe
 # 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 @@ CMAKE_CUSTOM_RULE_CODE
 # 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 @@ CMAKE_CUSTOM_RULE_CODE
 # 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 @@ CMAKE_CUSTOM_RULE_CODE
 # PROP Intermediate_Dir "RelWithDebInfo"

 # PROP Target_Dir ""

 

-CMAKE_CUSTOM_RULE_CODE

+CMAKE_CUSTOM_RULE_CODE_RELWITHDEBINFO

 

 !ENDIF 

 

diff --git a/Templates/staticLibHeader.dsptemplate b/Templates/staticLibHeader.dsptemplate
index b20efcc18a..9ef1822d7b 100644
--- a/Templates/staticLibHeader.dsptemplate
+++ b/Templates/staticLibHeader.dsptemplate
@@ -67,7 +67,7 @@ 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

+CMAKE_CUSTOM_RULE_CODE_RELEASE

 

 !ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 Debug"

 

@@ -95,7 +95,7 @@ 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

+CMAKE_CUSTOM_RULE_CODE_DEBUG

 

 !ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 MinSizeRel"

 

@@ -124,7 +124,7 @@ 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

+CMAKE_CUSTOM_RULE_CODE_MINSIZEREL

 

 !ELSEIF  "$(CFG)" == "OUTPUT_LIBNAME - Win32 RelWithDebInfo"

 

@@ -152,7 +152,7 @@ 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

+CMAKE_CUSTOM_RULE_CODE_RELWITHDEBINFO

 

 !ENDIF