Merge topic 'codegen-ninja' into release-3.31
5ce1ca607f Ninja: Add missing top-level codegen dependencies on per-directory codegen
5d0f2aba7e cmGlobalNinjaGenerator: Simplify per-directory configuration list lookup
505ffdcbde cmGlobalNinjaGenerator: Clarify order of codegen build statement logic
5f33736c03 cmGlobalNinjaGenerator: Fix local variable name for codegen target
e308d1bb88 cmGlobalNinjaGenerator: Remove unnecessary local variable
c08543d711 cmGlobalNinjaGenerator: Remove unused local variable
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10084
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 17e9c44..2933a4f 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -1631,26 +1631,22 @@
std::string const& currentBinaryDir = it.first;
DirectoryTarget const& dt = it.second;
std::vector<std::string> configs =
- dt.LG->GetMakefile()->GetGeneratorConfigs(
- cmMakefile::IncludeEmptyConfig);
+ static_cast<cmLocalNinjaGenerator const*>(dt.LG)->GetConfigNames();
// Setup target
- cmNinjaDeps configDeps;
build.Comment = cmStrCat("Folder: ", currentBinaryDir);
build.Outputs.emplace_back();
- std::string const buildDirAllTarget =
+ std::string const buildDirCodegenTarget =
this->ConvertToNinjaPath(cmStrCat(currentBinaryDir, "/codegen"));
-
- cmNinjaDeps& explicitDeps = build.ExplicitDeps;
-
for (auto const& config : configs) {
- explicitDeps.clear();
+ build.ExplicitDeps.clear();
+ build.Outputs.front() =
+ this->BuildAlias(buildDirCodegenTarget, config);
for (DirectoryTarget::Target const& t : dt.Targets) {
if (this->IsExcludedFromAllInConfig(t, config)) {
continue;
}
-
std::vector<cmSourceFile const*> customCommandSources;
t.GT->GetCustomCommands(customCommandSources, config);
for (cmSourceFile const* sf : customCommandSources) {
@@ -1659,13 +1655,19 @@
auto const& outputs = cc->GetOutputs();
std::transform(outputs.begin(), outputs.end(),
- std::back_inserter(explicitDeps),
+ std::back_inserter(build.ExplicitDeps),
this->MapToNinjaPath());
}
}
}
- build.Outputs.front() = this->BuildAlias(buildDirAllTarget, config);
+ for (DirectoryTarget::Dir const& d : dt.Children) {
+ if (!d.ExcludeFromAll) {
+ build.ExplicitDeps.emplace_back(this->BuildAlias(
+ this->ConvertToNinjaPath(cmStrCat(d.Path, "/codegen")), config));
+ }
+ }
+
// Write target
this->WriteBuild(this->EnableCrossConfigBuild() &&
this->CrossConfigs.count(config)
@@ -1677,8 +1679,9 @@
// Add shortcut target
if (this->IsMultiConfig()) {
for (auto const& config : configs) {
- build.ExplicitDeps = { this->BuildAlias(buildDirAllTarget, config) };
- build.Outputs.front() = buildDirAllTarget;
+ build.ExplicitDeps = { this->BuildAlias(buildDirCodegenTarget,
+ config) };
+ build.Outputs.front() = buildDirCodegenTarget;
this->WriteBuild(*this->GetConfigFileStream(config), build);
}
@@ -1686,9 +1689,9 @@
build.ExplicitDeps.clear();
for (auto const& config : this->DefaultConfigs) {
build.ExplicitDeps.push_back(
- this->BuildAlias(buildDirAllTarget, config));
+ this->BuildAlias(buildDirCodegenTarget, config));
}
- build.Outputs.front() = buildDirAllTarget;
+ build.Outputs.front() = buildDirCodegenTarget;
this->WriteBuild(*this->GetDefaultFileStream(), build);
}
}
@@ -1698,9 +1701,10 @@
build.ExplicitDeps.clear();
for (auto const& config : this->CrossConfigs) {
build.ExplicitDeps.push_back(
- this->BuildAlias(buildDirAllTarget, config));
+ this->BuildAlias(buildDirCodegenTarget, config));
}
- build.Outputs.front() = this->BuildAlias(buildDirAllTarget, "codegen");
+ build.Outputs.front() =
+ this->BuildAlias(buildDirCodegenTarget, "codegen");
this->WriteBuild(os, build);
}
}
@@ -1716,7 +1720,6 @@
static_cast<cmLocalNinjaGenerator const*>(dt.LG)->GetConfigNames();
// Setup target
- cmNinjaDeps configDeps;
build.Comment = cmStrCat("Folder: ", currentBinaryDir);
build.Outputs.emplace_back();
std::string const buildDirAllTarget =
@@ -1724,7 +1727,6 @@
for (auto const& config : configs) {
build.ExplicitDeps.clear();
build.Outputs.front() = this->BuildAlias(buildDirAllTarget, config);
- configDeps.emplace_back(build.Outputs.front());
for (DirectoryTarget::Target const& t : dt.Targets) {
if (!this->IsExcludedFromAllInConfig(t, config)) {
this->AppendTargetOutputs(t.GT, build.ExplicitDeps, config,
diff --git a/Tests/RunCMake/Codegen/RunCMakeTest.cmake b/Tests/RunCMake/Codegen/RunCMakeTest.cmake
index bbd70b0..7b072ba 100644
--- a/Tests/RunCMake/Codegen/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Codegen/RunCMakeTest.cmake
@@ -31,3 +31,7 @@
run_cmake("implicit-depends-append-codegen")
run_cmake("append-implicit-depends")
run_cmake("no-output")
+
+# Top-level codegen depends on that of subdirectories.
+run_codegen(SubDir)
+run_codegen(SubDirExcludeFromAll)
diff --git a/Tests/RunCMake/Codegen/SubDir-build-check.cmake b/Tests/RunCMake/Codegen/SubDir-build-check.cmake
new file mode 100644
index 0000000..d81aa40
--- /dev/null
+++ b/Tests/RunCMake/Codegen/SubDir-build-check.cmake
@@ -0,0 +1,9 @@
+set(filename "${RunCMake_TEST_BINARY_DIR}/generated.h")
+if(NOT EXISTS "${filename}")
+ string(APPEND RunCMake_TEST_FAILED "expected file NOT created:\n ${filename}\n")
+endif()
+
+set(filename "${RunCMake_TEST_BINARY_DIR}/SubDir/generated.h")
+if(NOT EXISTS "${filename}")
+ string(APPEND RunCMake_TEST_FAILED "expected file NOT created:\n ${filename}\n")
+endif()
diff --git a/Tests/RunCMake/Codegen/SubDir-common.cmake b/Tests/RunCMake/Codegen/SubDir-common.cmake
new file mode 100644
index 0000000..b4013d9
--- /dev/null
+++ b/Tests/RunCMake/Codegen/SubDir-common.cmake
@@ -0,0 +1,15 @@
+add_custom_command(
+ OUTPUT
+ ${CMAKE_CURRENT_BINARY_DIR}/generated.h
+ COMMAND
+ ${CMAKE_COMMAND} -E
+ copy ${CMAKE_CURRENT_SOURCE_DIR}/generated.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/generated.h
+ CODEGEN
+)
+
+add_library(errorlib_top
+ # If this library is built error.c will cause the build to fail
+ error.c
+ ${CMAKE_CURRENT_BINARY_DIR}/generated.h
+)
diff --git a/Tests/RunCMake/Codegen/SubDir.cmake b/Tests/RunCMake/Codegen/SubDir.cmake
new file mode 100644
index 0000000..5e5ff7b
--- /dev/null
+++ b/Tests/RunCMake/Codegen/SubDir.cmake
@@ -0,0 +1,2 @@
+add_subdirectory(SubDir)
+include(SubDir-common.cmake)
diff --git a/Tests/RunCMake/Codegen/SubDir/CMakeLists.txt b/Tests/RunCMake/Codegen/SubDir/CMakeLists.txt
new file mode 100644
index 0000000..58f2f6e
--- /dev/null
+++ b/Tests/RunCMake/Codegen/SubDir/CMakeLists.txt
@@ -0,0 +1,15 @@
+add_custom_command(
+ OUTPUT
+ ${CMAKE_CURRENT_BINARY_DIR}/generated.h
+ COMMAND
+ ${CMAKE_COMMAND} -E
+ copy ${CMAKE_CURRENT_SOURCE_DIR}/../generated.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/generated.h
+ CODEGEN
+)
+
+add_library(errorlib_subdir
+ # If this library is built error.c will cause the build to fail
+ ../error.c
+ ${CMAKE_CURRENT_BINARY_DIR}/generated.h
+)
diff --git a/Tests/RunCMake/Codegen/SubDirExcludeFromAll-build-check.cmake b/Tests/RunCMake/Codegen/SubDirExcludeFromAll-build-check.cmake
new file mode 100644
index 0000000..9357747
--- /dev/null
+++ b/Tests/RunCMake/Codegen/SubDirExcludeFromAll-build-check.cmake
@@ -0,0 +1,9 @@
+set(filename "${RunCMake_TEST_BINARY_DIR}/generated.h")
+if(NOT EXISTS "${filename}")
+ string(APPEND RunCMake_TEST_FAILED "expected file NOT created:\n ${filename}\n")
+endif()
+
+set(filename "${RunCMake_TEST_BINARY_DIR}/SubDir/generated.h")
+if(EXISTS "${filename}")
+ string(APPEND RunCMake_TEST_FAILED "unexpected file created:\n ${filename}\n")
+endif()
diff --git a/Tests/RunCMake/Codegen/SubDirExcludeFromAll.cmake b/Tests/RunCMake/Codegen/SubDirExcludeFromAll.cmake
new file mode 100644
index 0000000..707da29
--- /dev/null
+++ b/Tests/RunCMake/Codegen/SubDirExcludeFromAll.cmake
@@ -0,0 +1,2 @@
+add_subdirectory(SubDir EXCLUDE_FROM_ALL)
+include(SubDir-common.cmake)
