mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 06:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'cmp0082-exclude-from-all'

Browse Source 
bf75369ed4 Merge branch 'master' into cmp0082-exclude-from-all
38f2562d5b CMP0082: Check EXCLUDE_FROM_ALL property at generate time

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6158
This commit is contained in:
Brad King
2021-05-25 14:00:25 +00:00
committed by Kitware Robot
parent 0f553b14b4 bf75369ed4
commit 2d6d77ec1d
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"
cmInstallSubdirectoryGenerator::cmInstallSubdirectoryGenerator(
cmMakefile* makefile, std::string binaryDirectory, bool excludeFromAll,
cmMakefile* makefile, std::string binaryDirectory,
cmListFileBacktrace backtrace)
: cmInstallGenerator("", std::vector<std::string>(), "", MessageDefault,
excludeFromAll, false, std::move(backtrace))
false, false, std::move(backtrace))
, Makefile(makefile)
, BinaryDirectory(std::move(binaryDirectory))
{
@@ -52,7 +52,7 @@ bool cmInstallSubdirectoryGenerator::Compute(cmLocalGenerator* lg)
void cmInstallSubdirectoryGenerator::GenerateScript(std::ostream& os)
{
if (!this->ExcludeFromAll) {
if (!this->Makefile->GetPropertyAsBool("EXCLUDE_FROM_ALL")) {
cmPolicies::PolicyStatus status =
this->LocalGenerator->GetPolicyStatus(cmPolicies::CMP0082);
switch (status) {

1
Source/cmInstallSubdirectoryGenerator.h
View File

@@ -21,7 +21,6 @@ class cmInstallSubdirectoryGenerator : public cmInstallGenerator
public:
cmInstallSubdirectoryGenerator(cmMakefile* makefile,
std::string binaryDirectory,
bool excludeFromAll,
cmListFileBacktrace backtrace);
~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>(
subMf, binPath, excludeFromAll, this->GetBacktrace()));
subMf, binPath, this->GetBacktrace()));
}
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\")")
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-ExcludeFromAll EXCLUDE_FROM_ALL)
add_subdirectory(CMP0082-ExcludeFromAll)
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-ExcludeFromAll EXCLUDE_FROM_ALL)
add_subdirectory(CMP0082-ExcludeFromAll)
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-ExcludeFromAll EXCLUDE_FROM_ALL)
add_subdirectory(CMP0082-ExcludeFromAll)
install(CODE "message(STATUS \"top\")")