diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-11-26 09:34:44 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-11-26 12:01:29 (GMT) |
| commit | 9eedc850eb1419d678bda8137610dba1c289bb6a (patch) | |
| tree | a34441e8838c489af082ed2b3c1ed6d9027fada9 /Source/cmInstallCommandArguments.cxx | |
| parent | 80790f33114cb6d80dfa0fd139cb2d92608cc68c (diff) | |
| download | CMake-9eedc850eb1419d678bda8137610dba1c289bb6a.zip CMake-9eedc850eb1419d678bda8137610dba1c289bb6a.tar.gz CMake-9eedc850eb1419d678bda8137610dba1c289bb6a.tar.bz2 | |
Export: Process relative includes after genex evaluation.
In code such as
install(TARGETS ...
INCLUDES DESTINATION $<FOO>include
)
the generator expressions are evaluated at generate-time. Delay
determining whether each entry is a relative path until after
the generator expressions are evaluated. Such relative paths
are based relative to the CMAKE_INSTALL_PREFIX.
Diffstat (limited to 'Source/cmInstallCommandArguments.cxx')
| -rw-r--r-- | Source/cmInstallCommandArguments.cxx | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Source/cmInstallCommandArguments.cxx b/Source/cmInstallCommandArguments.cxx index 91ea861..236ca1f 100644 --- a/Source/cmInstallCommandArguments.cxx +++ b/Source/cmInstallCommandArguments.cxx @@ -228,11 +228,6 @@ void cmInstallCommandIncludesArgument::Parse( for ( ; it != args->end(); ++it) { std::string dir = *it; - if (!cmSystemTools::FileIsFullPath(it->c_str()) - && cmGeneratorExpression::Find(*it) == std::string::npos) - { - dir = "$<INSTALL_PREFIX>/" + dir; - } cmSystemTools::ConvertToUnixSlashes(dir); this->IncludeDirs.push_back(dir); } |