diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-11 12:44:31 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-02-11 12:44:40 (GMT) |
| commit | d9ddb30e92ce1c9c98ce6603660b631cd42bfed0 (patch) | |
| tree | 360ad9e9ed2493a8d4ed552088cce609c2cbc109 /Source/cmMakefile.cxx | |
| parent | 56c2eab1e23fa92594bf0696ea351d77ae3aebe8 (diff) | |
| parent | f87e724e8c193df3b9b30ddd0b9d2ec7c6ac2ba7 (diff) | |
| download | CMake-d9ddb30e92ce1c9c98ce6603660b631cd42bfed0.zip CMake-d9ddb30e92ce1c9c98ce6603660b631cd42bfed0.tar.gz CMake-d9ddb30e92ce1c9c98ce6603660b631cd42bfed0.tar.bz2 | |
Merge topic 'fix-exclude-dir-with-iface'
f87e724e8c Fix EXCLUDE_FROM_ALL on directory with an interface library
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2937
Diffstat (limited to 'Source/cmMakefile.cxx')
| -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 1839333..cae96f2 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); |