summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-04-17 11:35:14 -0400
committerCMake Topic Stage <kwrobot@kitware.com>2013-04-17 11:35:14 -0400
commit5b5a365aa676d93d7b574735e80e9625d57c8e52 (patch)
tree9a1a5dded97556102f4af484ee4835dd82964e81 /Source
parentf2958ff984bb38319f988eb39c09cc8792ed4ca5 (diff)
parent5a5e0fa9d35ea49ef9d31993ab415fc0e390e8b0 (diff)
downloadcmake-5b5a365aa676d93d7b574735e80e9625d57c8e52.tar.gz
Merge topic 'fix-clear-INCLUDE_DIRECTORIES-prop'
5a5e0fa Fix clearing of the INCLUDE_DIRECTORIES DIRECTORY property.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmMakefile.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 25ccbc739a..47a6d2e66c 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3458,6 +3458,10 @@ void cmMakefile::SetProperty(const char* prop, const char* value)
if (propname == "INCLUDE_DIRECTORIES")
{
this->IncludeDirectoriesEntries.clear();
+ if (!value)
+ {
+ return;
+ }
cmListFileBacktrace lfbt;
this->GetBacktrace(lfbt);
this->IncludeDirectoriesEntries.push_back(