diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-08 19:02:03 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-02-08 19:02:03 (GMT) |
| commit | 3b58b647aedd0f4717c3f22bb7d3e8b0b559f099 (patch) | |
| tree | e4f041fab6141917422fd9adc2add245b1c2e724 /Source | |
| parent | 3b87e7aaa3f8a7c9c2b9d552241d20292ee7fd7c (diff) | |
| parent | f87e724e8c193df3b9b30ddd0b9d2ec7c6ac2ba7 (diff) | |
| download | CMake-3b58b647aedd0f4717c3f22bb7d3e8b0b559f099.zip CMake-3b58b647aedd0f4717c3f22bb7d3e8b0b559f099.tar.gz CMake-3b58b647aedd0f4717c3f22bb7d3e8b0b559f099.tar.bz2 | |
Merge branch 'fix-exclude-dir-with-iface' into release-3.14
Merge-request: !2937
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefile.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index ab139c0..7e33bda 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1985,7 +1985,9 @@ cmTarget* cmMakefile::AddLibrary(const std::string& lname, // over changes in CMakeLists.txt, making the information stale and // hence useless. target->ClearDependencyInformation(*this); - if (excludeFromAll || this->GetPropertyAsBool("EXCLUDE_FROM_ALL")) { + if (excludeFromAll || + (type != cmStateEnums::INTERFACE_LIBRARY && + this->GetPropertyAsBool("EXCLUDE_FROM_ALL"))) { target->SetProperty("EXCLUDE_FROM_ALL", "TRUE"); } target->AddSources(srcs); |