summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2013-07-27 09:14:56 (GMT)
committerStephen Kelly <steveire@gmail.com>2013-07-29 13:50:24 (GMT)
commitf868e47236f8872a1edc84ae084f49609def06ad (patch)
treecc551b34ccb3382bf6650b3368e8ae10d21e0899 /Source
parent46558d290be1760828714545f41afae17b0c71c9 (diff)
downloadCMake-f868e47236f8872a1edc84ae084f49609def06ad.zip
CMake-f868e47236f8872a1edc84ae084f49609def06ad.tar.gz
CMake-f868e47236f8872a1edc84ae084f49609def06ad.tar.bz2
Fix crash on export of target with empty INTERFACE_INCLUDE_DIRECTORIES.
The new feature of install(TARGETS ... INCLUDES DESTINATION) introduced in commit 650e61f8 (Add a convenient way to add the includes install dir to the INTERFACE., 2013-01-05) introduced this crash. If the new feature is used with a target which has no INTERFACE_INCLUDE_DIRECTORIES, a segfault occurred.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmExportFileGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 36802b5..084829d 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -291,7 +291,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
{
return;
}
- if (!*input && tei->InterfaceIncludeDirectories.empty())
+ if ((input && !*input) && tei->InterfaceIncludeDirectories.empty())
{
// Set to empty
properties[propName] = "";