diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-08 17:54:11 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-06-08 17:54:11 (GMT) |
| commit | d17aa60659a1a69f9101c61a149eca5842291226 (patch) | |
| tree | 3f174d1aeb08bacf51bb523841a066a8d25c4339 /Source/cmGetCMakePropertyCommand.cxx | |
| parent | ccc6fe94453444ebd5e655a9f90a5d074049f846 (diff) | |
| parent | 8174e5cd9424a7f45174562f21eb80eb06a3f3d0 (diff) | |
| download | CMake-d17aa60659a1a69f9101c61a149eca5842291226.zip CMake-d17aa60659a1a69f9101c61a149eca5842291226.tar.gz CMake-d17aa60659a1a69f9101c61a149eca5842291226.tar.bz2 | |
Merge topic 'data-layout'
8174e5cd cmCustomCommand: Remove special member functions.
34e1d6db cmCustomCommand: Re-arrange data layout.
54cb76f2 cmComputeLinkDepends: Re-arrange data layout.
b661d6c6 cmQtAutoGenerators: Re-arrange data layout.
40844a14 cmProcessTools: Re-arrange data layout.
b1ff32af cmOrderDirectories: Re-arrange data layout.
dd0417c7 cmInstallTargetGenerator: Re-arrange data layout.
125c4866 cmInstallFilesGenerator: Re-arrange data layout.
92b8b1fc cmGraphVizWriter: Re-arrange data layout.
7f3e1623 cmGlobalGenerator: Re-arrange data layout.
d9df7fa7 cmComputeComponentGraph: Re-arrange data layout.
db24e41b cmCommandArgumentParserHelper: Re-arrange data.
4cd13e80 cmComputeLinkInformation: Re-arrange data layout.
3e087a40 cmLocalUnixMakefileGenerator: Re-arrange data layout.
e0421701 cmMakefile: Re-arrange data layout.
c26696eb cmSourceFile: Re-arrange data.
...
Diffstat (limited to 'Source/cmGetCMakePropertyCommand.cxx')
| -rw-r--r-- | Source/cmGetCMakePropertyCommand.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/cmGetCMakePropertyCommand.cxx b/Source/cmGetCMakePropertyCommand.cxx index 61cf85b..a460ca6 100644 --- a/Source/cmGetCMakePropertyCommand.cxx +++ b/Source/cmGetCMakePropertyCommand.cxx @@ -51,9 +51,11 @@ bool cmGetCMakePropertyCommand } else { - const char *prop = - this->Makefile->GetState() - ->GetGlobalProperty(args[1]); + const char *prop = 0; + if (!args[1].empty()) + { + prop = this->Makefile->GetState()->GetGlobalProperty(args[1]); + } if (prop) { output = prop; |