diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-11-26 01:38:55 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-11-26 09:30:18 (GMT) |
| commit | 38afc82e764ed9071748df9f5386c53f26657fe5 (patch) | |
| tree | fa1f5dbe9f03b57c6f5070dd2da27a8defe7ef7b /Source/cmTargetIncludeDirectoriesCommand.cxx | |
| parent | da6b86f4f031b189768dc474721145a1b99f71ea (diff) | |
| download | CMake-38afc82e764ed9071748df9f5386c53f26657fe5.zip CMake-38afc82e764ed9071748df9f5386c53f26657fe5.tar.gz CMake-38afc82e764ed9071748df9f5386c53f26657fe5.tar.bz2 | |
target_include_directories: Allow relative path with genex
Treat paths which are relative and which contain a generator
expression which is not at the beginning as relative to the
source directory.
This matches the behavior of paths which are relative but contain
no generator expression at all.
Previously this would generate a relative path with the IMPORTED
target on export(), which would be a reported as a non-existent
path on import. If used directly in the buildsystem, it would be
reported as a relative path, which is also an error. There is no
need for a policy in this case.
Diffstat (limited to 'Source/cmTargetIncludeDirectoriesCommand.cxx')
| -rw-r--r-- | Source/cmTargetIncludeDirectoriesCommand.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmTargetIncludeDirectoriesCommand.cxx b/Source/cmTargetIncludeDirectoriesCommand.cxx index e7b906c..913bdab 100644 --- a/Source/cmTargetIncludeDirectoriesCommand.cxx +++ b/Source/cmTargetIncludeDirectoriesCommand.cxx @@ -50,7 +50,7 @@ std::string cmTargetIncludeDirectoriesCommand it != content.end(); ++it) { if (cmSystemTools::FileIsFullPath(it->c_str()) - || cmGeneratorExpression::Find(*it) != std::string::npos) + || cmGeneratorExpression::Find(*it) == 0) { dirs += sep + *it; } |