Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-17 15:32:10 +08:00
Code Issues Projects Releases Wiki Activity

CMP0082: Check EXCLUDE_FROM_ALL property at generate time

Browse Source 
Fixes: #22234
This commit is contained in:
Kyle Edwards
2021-05-24 13:40:25 -04:00
parent fe9988add3
commit 38f2562d5b
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmInstallSubdirectoryGenerator.cxx
View File

@@ -14,10 +14,10 @@
#include "cmSystemTools.h" #include "cmSystemTools.h"
cmInstallSubdirectoryGenerator::cmInstallSubdirectoryGenerator( cmInstallSubdirectoryGenerator::cmInstallSubdirectoryGenerator(
cmMakefile* makefile, std::string binaryDirectory, bool excludeFromAll, cmMakefile* makefile, std::string binaryDirectory,
cmListFileBacktrace backtrace) cmListFileBacktrace backtrace)
: cmInstallGenerator("", std::vector<std::string>(), "", MessageDefault, : cmInstallGenerator("", std::vector<std::string>(), "", MessageDefault,
excludeFromAll, std::move(backtrace)) false, std::move(backtrace))
, Makefile(makefile) , Makefile(makefile)
, BinaryDirectory(std::move(binaryDirectory)) , BinaryDirectory(std::move(binaryDirectory))
{ {
@@ -52,7 +52,7 @@ bool cmInstallSubdirectoryGenerator::Compute(cmLocalGenerator* lg)
void cmInstallSubdirectoryGenerator::GenerateScript(std::ostream& os) void cmInstallSubdirectoryGenerator::GenerateScript(std::ostream& os)
{ {
if (!this->ExcludeFromAll) { if (!this->Makefile->GetPropertyAsBool("EXCLUDE_FROM_ALL")) {
cmPolicies::PolicyStatus status = cmPolicies::PolicyStatus status =
this->LocalGenerator->GetPolicyStatus(cmPolicies::CMP0082); this->LocalGenerator->GetPolicyStatus(cmPolicies::CMP0082);
switch (status) { switch (status) {

1
Source/cmInstallSubdirectoryGenerator.h
View File

@@ -21,7 +21,6 @@ class cmInstallSubdirectoryGenerator : public cmInstallGenerator
public: public:
cmInstallSubdirectoryGenerator(cmMakefile* makefile, cmInstallSubdirectoryGenerator(cmMakefile* makefile,
std::string binaryDirectory, std::string binaryDirectory,
bool excludeFromAll,
cmListFileBacktrace backtrace); cmListFileBacktrace backtrace);
~cmInstallSubdirectoryGenerator() override; ~cmInstallSubdirectoryGenerator() override;

2
Source/cmMakefile.cxx
View File

@@ -1844,7 +1844,7 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
} }
this->AddInstallGenerator(cm::make_unique<cmInstallSubdirectoryGenerator>( this->AddInstallGenerator(cm::make_unique<cmInstallSubdirectoryGenerator>(
subMf, binPath, excludeFromAll, this->GetBacktrace())); subMf, binPath, this->GetBacktrace()));
} }
const std::string& cmMakefile::GetCurrentSourceDirectory() const const std::string& cmMakefile::GetCurrentSourceDirectory() const

1
Tests/RunCMake/add_subdirectory/CMP0082-ExcludeFromAll/CMakeLists.txt
View File

@@ -1 +1,2 @@
install(CODE "message(STATUS \"exclude\")") install(CODE "message(STATUS \"exclude\")")
set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL TRUE)

2
Tests/RunCMake/add_subdirectory/CMP0082-NEW.cmake
View File

@@ -1,3 +1,3 @@
add_subdirectory(CMP0082) add_subdirectory(CMP0082)
add_subdirectory(CMP0082-ExcludeFromAll EXCLUDE_FROM_ALL) add_subdirectory(CMP0082-ExcludeFromAll)
install(CODE "message(STATUS \"top\")") install(CODE "message(STATUS \"top\")")

2
Tests/RunCMake/add_subdirectory/CMP0082-OLD.cmake
View File

@@ -1,3 +1,3 @@
add_subdirectory(CMP0082) add_subdirectory(CMP0082)
add_subdirectory(CMP0082-ExcludeFromAll EXCLUDE_FROM_ALL) add_subdirectory(CMP0082-ExcludeFromAll)
install(CODE "message(STATUS \"top\")") install(CODE "message(STATUS \"top\")")

2
Tests/RunCMake/add_subdirectory/CMP0082-WARN.cmake
View File

@@ -1,3 +1,3 @@
add_subdirectory(CMP0082) add_subdirectory(CMP0082)
add_subdirectory(CMP0082-ExcludeFromAll EXCLUDE_FROM_ALL) add_subdirectory(CMP0082-ExcludeFromAll)
install(CODE "message(STATUS \"top\")") install(CODE "message(STATUS \"top\")")