diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-01-12 11:11:29 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-01-15 19:36:22 (GMT) |
| commit | 4ee872cb99f49ac5a95768da454f3313ba87182f (patch) | |
| tree | caa573a00cb61a298e5c8345be5c9a962753291e /Source/cmGlobalGenerator.cxx | |
| parent | 1d47cd94f3748d287f676f3847d42f3674062dcd (diff) | |
| download | CMake-4ee872cb99f49ac5a95768da454f3313ba87182f.zip CMake-4ee872cb99f49ac5a95768da454f3313ba87182f.tar.gz CMake-4ee872cb99f49ac5a95768da454f3313ba87182f.tar.bz2 | |
Make the BUILD_INTERFACE of export()ed targets work.
The existing BUILD_INTERFACE code is executed at generate time, which
is too late for export().
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index d030aa7..d2baf53 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -941,19 +941,7 @@ void cmGlobalGenerator::Generate() for ( tit = targets->begin(); tit != targets->end(); ++ tit ) { - if (mf->IsOn("CMAKE_BUILD_INTERFACE_INCLUDES")) - { - const char *binDir = mf->GetStartOutputDirectory(); - const char *srcDir = mf->GetStartDirectory(); - const std::string dirs = std::string(binDir ? binDir : "") - + std::string(binDir ? ";" : "") - + std::string(srcDir ? srcDir : ""); - if (!dirs.empty()) - { - tit->second.AppendProperty("INTERFACE_INCLUDE_DIRECTORIES", - ("$<BUILD_INTERFACE:" + dirs + ">").c_str()); - } - } + tit->second.AppendBuildInterfaceIncludes(); } } |