Fix config-specific INCLUDE_DIRECTORIES in multi-config generators

Commit 08cb4fa4 (Process generator expressions in the
INCLUDE_DIRECTORIES property, 2012-09-18) contained an incorrect
assumption that CMAKE_BUILD_TYPE was set on the makefile for each
generated configuration in multi-config generators. Fix that by making
the GetIncludeDirectories API depend on the config.

4 files changed, 33 insertions, 33 deletions

diff --git a/Templates/DLLHeader.dsptemplate b/Templates/DLLHeader.dsptemplate
index c752fdbf46..d9bccaf561 100644
--- a/Templates/DLLHeader.dsptemplate
+++ b/Templates/DLLHeader.dsptemplate
@@ -59,13 +59,13 @@ RSC=rc.exe
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL" OUTPUT_LIBNAME_EXPORTS /FD /c

 # ADD CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL"  /FD /c

-# ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

+# ADD CPP BUILD_INCLUDES_RELEASE EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_RELEASE

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

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

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

-# ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"

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

 # ADD RSC COMPILE_DEFINITIONS

 # ADD RSC COMPILE_DEFINITIONS_RELEASE

 BSC32=bscmake.exe

@@ -93,13 +93,13 @@ CMAKE_CUSTOM_RULE_CODE_RELEASE
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" OUTPUT_LIBNAME_EXPORTS /FD /c

 # ADD CPP /nologo /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL"  /FD /c

-# ADD CPP BUILD_INCLUDES EXTRA_DEFINES  OUTPUT_LIBNAME_EXPORTS

+# ADD CPP BUILD_INCLUDES_DEBUG EXTRA_DEFINES  OUTPUT_LIBNAME_EXPORTS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_DEBUG

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC BUILD_INCLUDES /l 0x409 /d "_DEBUG"

+# ADD RSC BUILD_INCLUDES_DEBUG /l 0x409 /d "_DEBUG"

 # ADD RSC COMPILE_DEFINITIONS

 # ADD RSC COMPILE_DEFINITIONS_DEBUG

 BSC32=bscmake.exe

@@ -129,13 +129,13 @@ CMAKE_CUSTOM_RULE_CODE_DEBUG
 # ADD BASE CPP /nologo /D "WIN32"  /D "_WINDOWS" /D "_USRDLL" /FD /c  OUTPUT_LIBNAME_EXPORTS

 # SUBTRACT BASE CPP /YX

 # ADD CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL"  /FD /c

-# ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

+# ADD CPP BUILD_INCLUDES_MINSIZEREL EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

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

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

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

-# ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"

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

 # ADD RSC COMPILE_DEFINITIONS

 # ADD RSC COMPILE_DEFINITIONS_MINSIZEREL

 BSC32=bscmake.exe

@@ -163,13 +163,13 @@ CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL" OUTPUT_LIBNAME_EXPORTS /FD /c

 # ADD CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL"  /FD /c

-# ADD CPP BUILD_INCLUDES EXTRA_DEFINES  OUTPUT_LIBNAME_EXPORTS

+# ADD CPP BUILD_INCLUDES_RELWITHDEBINFO EXTRA_DEFINES  OUTPUT_LIBNAME_EXPORTS

 # ADD CPP CMAKE_CXX_FLAGS

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

-# ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"

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

 # ADD RSC COMPILE_DEFINITIONS

 # ADD RSC COMPILE_DEFINITIONS_RELWITHDEBINFO

 BSC32=bscmake.exe

diff --git a/Templates/EXEHeader.dsptemplate b/Templates/EXEHeader.dsptemplate
index f48eaccbc6..3a6d2feb11 100644
--- a/Templates/EXEHeader.dsptemplate
+++ b/Templates/EXEHeader.dsptemplate
@@ -58,11 +58,11 @@ RSC=rc.exe
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c

 # ADD CPP /nologo  /D "WIN32"  /D "NDEBUG" /D "_CONSOLE" /FD /c

-# ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

+# ADD CPP BUILD_INCLUDES_RELEASE EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_RELEASE

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

-# ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"

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

 # ADD RSC COMPILE_DEFINITIONS

 # ADD RSC COMPILE_DEFINITIONS_RELEASE

 BSC32=bscmake.exe

@@ -90,13 +90,13 @@ CMAKE_CUSTOM_RULE_CODE_RELEASE
 # PROP Target_Dir ""

 # ADD BASE CPP   /D "WIN32" /D "_DEBUG" /D "_CONSOLE"  /FD /GZ /c

 # ADD CPP /nologo  /D "WIN32"  /D "_DEBUG" /D "_CONSOLE" /FD /GZ /c

-# ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

+# ADD CPP BUILD_INCLUDES_DEBUG EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_DEBUG

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC BUILD_INCLUDES /l 0x409 /d "_DEBUG"

+# ADD RSC BUILD_INCLUDES_DEBUG /l 0x409 /d "_DEBUG"

 # ADD RSC COMPILE_DEFINITIONS

 # ADD RSC COMPILE_DEFINITIONS_DEBUG

 BSC32=bscmake.exe

@@ -122,12 +122,12 @@ CMAKE_CUSTOM_RULE_CODE_DEBUG
 # PROP Intermediate_Dir "MinSizeRel"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c

-# ADD CPP /nologo  /D "WIN32" BUILD_INCLUDES EXTRA_DEFINES /D "NDEBUG" /D "_CONSOLE"  /FD /c

-# ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

+# ADD CPP /nologo  /D "WIN32" BUILD_INCLUDES_MINSIZEREL EXTRA_DEFINES /D "NDEBUG" /D "_CONSOLE"  /FD /c

+# ADD CPP BUILD_INCLUDES_MINSIZEREL EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

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

-# ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"

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

 # ADD RSC COMPILE_DEFINITIONS

 # ADD RSC COMPILE_DEFINITIONS_MINSIZEREL

 BSC32=bscmake.exe

@@ -155,11 +155,11 @@ CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c

 # ADD CPP /nologo  /D "WIN32"  /D "NDEBUG" /D "_CONSOLE" /FD /c

-# ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

+# ADD CPP BUILD_INCLUDES_RELWITHDEBINFO EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO

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

-# ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"

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

 # ADD RSC COMPILE_DEFINITIONS

 # ADD RSC COMPILE_DEFINITIONS_RELWITHDEBINFO

 BSC32=bscmake.exe

diff --git a/Templates/EXEWinHeader.dsptemplate b/Templates/EXEWinHeader.dsptemplate
index e0d2264790..350e3ea009 100644
--- a/Templates/EXEWinHeader.dsptemplate
+++ b/Templates/EXEWinHeader.dsptemplate
@@ -58,13 +58,13 @@ RSC=rc.exe
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

 # ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

-# ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

+# ADD CPP BUILD_INCLUDES_RELEASE EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_RELEASE

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

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

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

-# ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"

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

 # ADD RSC COMPILE_DEFINITIONS

 # ADD RSC COMPILE_DEFINITIONS_RELEASE

 BSC32=bscmake.exe

@@ -92,13 +92,13 @@ CMAKE_CUSTOM_RULE_CODE_RELEASE
 # PROP Target_Dir ""

 # ADD BASE CPP  /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c

 # ADD CPP /nologo  /D "WIN32"  /D "_DEBUG" /D "_WINDOWS" /FD /GZ /c

-# ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

+# ADD CPP BUILD_INCLUDES_DEBUG EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_DEBUG

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC BUILD_INCLUDES /l 0x409 /d "_DEBUG"

+# ADD RSC BUILD_INCLUDES_DEBUG /l 0x409 /d "_DEBUG"

 # ADD RSC COMPILE_DEFINITIONS

 # ADD RSC COMPILE_DEFINITIONS_DEBUG

 BSC32=bscmake.exe

@@ -125,11 +125,11 @@ CMAKE_CUSTOM_RULE_CODE_DEBUG
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

 # ADD CPP /nologo  /D "WIN32"  /D "NDEBUG" /D "_WINDOWS" /FD /c

-# ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

+# ADD CPP BUILD_INCLUDES_MINSIZEREL EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

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

-# ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"

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

 # ADD RSC COMPILE_DEFINITIONS

 # ADD RSC COMPILE_DEFINITIONS_MINSIZEREL

 BSC32=bscmake.exe

@@ -157,13 +157,13 @@ CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

 # ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

-# ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

+# ADD CPP BUILD_INCLUDES_RELWITHDEBINFO EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

 # ADD CPP CMAKE_CXX_FLAGS

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

-# ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"

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

 # ADD RSC COMPILE_DEFINITIONS

 # ADD RSC COMPILE_DEFINITIONS_RELWITHDEBINFO

 BSC32=bscmake.exe

diff --git a/Templates/staticLibHeader.dsptemplate b/Templates/staticLibHeader.dsptemplate
index 16b784e175..a8892e1246 100644
--- a/Templates/staticLibHeader.dsptemplate
+++ b/Templates/staticLibHeader.dsptemplate
@@ -55,11 +55,11 @@ RSC=rc.exe
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_LIB"  /FD /c

 # ADD CPP /nologo /D "NDEBUG" /D "WIN32" /D "_LIB"  /FD /c

-# ADD CPP BUILD_INCLUDES EXTRA_DEFINES 

+# ADD CPP BUILD_INCLUDES_RELEASE EXTRA_DEFINES

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_RELEASE

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

-# ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"

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

 # ADD RSC COMPILE_DEFINITIONS

 # ADD RSC COMPILE_DEFINITIONS_RELEASE

 BSC32=bscmake.exe

@@ -85,11 +85,11 @@ CMAKE_CUSTOM_RULE_CODE_RELEASE
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /D "WIN32" /D "_DEBUG" /D "_LIB"  /FD /c

 # ADD CPP /nologo /D "_DEBUG" /D "WIN32" /D "_LIB"  /FD /GZ /c

-# ADD CPP BUILD_INCLUDES EXTRA_DEFINES 

+# ADD CPP BUILD_INCLUDES_DEBUG EXTRA_DEFINES

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_DEBUG

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC BUILD_INCLUDES /l 0x409 /d "_DEBUG"

+# ADD RSC BUILD_INCLUDES_DEBUG /l 0x409 /d "_DEBUG"

 # ADD RSC COMPILE_DEFINITIONS

 # ADD RSC COMPILE_DEFINITIONS_DEBUG

 BSC32=bscmake.exe

@@ -116,11 +116,11 @@ CMAKE_CUSTOM_RULE_CODE_DEBUG
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_ATL_DLL" /FD /c

 # ADD CPP /nologo /D "NDEBUG" /D "_ATL_DLL"  /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /FD /c

-# ADD CPP BUILD_INCLUDES EXTRA_DEFINES 

+# ADD CPP BUILD_INCLUDES_MINSIZEREL EXTRA_DEFINES

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

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

-# ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"

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

 # ADD RSC COMPILE_DEFINITIONS

 # ADD RSC COMPILE_DEFINITIONS_MINSIZEREL

 BSC32=bscmake.exe

@@ -146,11 +146,11 @@ CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_LIB"  /FD /c

 # ADD CPP /nologo /D "NDEBUG" /D "WIN32" /D "_LIB"  /FD /c

-# ADD CPP BUILD_INCLUDES EXTRA_DEFINES 

+# ADD CPP BUILD_INCLUDES_RELWITHDEBINFO EXTRA_DEFINES

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO

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

-# ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"

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

 # ADD RSC COMPILE_DEFINITIONS

 # ADD RSC COMPILE_DEFINITIONS_RELWITHDEBINFO

 BSC32=bscmake.exe