diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-08 14:02:03 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-02-08 14:02:03 -0500 |
| commit | 3b58b647aedd0f4717c3f22bb7d3e8b0b559f099 (patch) | |
| tree | e4f041fab6141917422fd9adc2add245b1c2e724 | |
| parent | 3b87e7aaa3f8a7c9c2b9d552241d20292ee7fd7c (diff) | |
| parent | f87e724e8c193df3b9b30ddd0b9d2ec7c6ac2ba7 (diff) | |
| download | cmake-3b58b647aedd0f4717c3f22bb7d3e8b0b559f099.tar.gz | |
Merge branch 'fix-exclude-dir-with-iface' into release-3.14
Merge-request: !2937
| -rw-r--r-- | Source/cmMakefile.cxx | 4 | ||||
| -rw-r--r-- | Tests/InterfaceLibrary/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/InterfaceLibrary/excluded/CMakeLists.txt | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index ab139c0f1e..7e33bda27f 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); diff --git a/Tests/InterfaceLibrary/CMakeLists.txt b/Tests/InterfaceLibrary/CMakeLists.txt index 6aae09ac29..954c02d511 100644 --- a/Tests/InterfaceLibrary/CMakeLists.txt +++ b/Tests/InterfaceLibrary/CMakeLists.txt @@ -47,6 +47,7 @@ target_link_libraries(InterfaceLibrary add_dependencies(InterfaceLibrary item_fake_tgt) add_subdirectory(libsdir) +add_subdirectory(excluded EXCLUDE_FROM_ALL) add_executable(sharedlibtestexe sharedlibtestexe.cpp) target_link_libraries(sharedlibtestexe shared_iface imported::iface) diff --git a/Tests/InterfaceLibrary/excluded/CMakeLists.txt b/Tests/InterfaceLibrary/excluded/CMakeLists.txt new file mode 100644 index 0000000000..69a6807c90 --- /dev/null +++ b/Tests/InterfaceLibrary/excluded/CMakeLists.txt @@ -0,0 +1 @@ +add_library(excluded_iface INTERFACE) |