summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalGenerator.h
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2012-10-15 08:42:42 (GMT)
committerBrad King <brad.king@kitware.com>2012-10-17 20:24:14 (GMT)
commit2a6bd96c1354484b4f9e71d11422f8da028c1622 (patch)
treec31212f22e9e5f0d05ab36b874f642d11f828c61 /Source/cmLocalGenerator.h
parent79edd00235091475d5b3f1305bcf991cad3e45f4 (diff)
downloadCMake-2a6bd96c1354484b4f9e71d11422f8da028c1622.zip
CMake-2a6bd96c1354484b4f9e71d11422f8da028c1622.tar.gz
CMake-2a6bd96c1354484b4f9e71d11422f8da028c1622.tar.bz2
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.
Diffstat (limited to 'Source/cmLocalGenerator.h')
-rw-r--r--Source/cmLocalGenerator.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 49bce38..bd58218 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -212,7 +212,7 @@ public:
/** Get the include flags for the current makefile and language. */
void GetIncludeDirectories(std::vector<std::string>& dirs,
cmGeneratorTarget* target,
- const char* lang = "C");
+ const char* lang = "C", const char *config = 0);
/** Compute the language used to compile the given source file. */
const char* GetSourceFileLanguage(const cmSourceFile& source);