mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-26 18:58:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

PCH: Fix Xcode non-pch language exclusion

Browse Source 
Fix a regression caused by commit bbcdac4e5d (PCH: Fix all-language
precompile header support in Xcode, 2021-08-07, v3.22.0-rc1~140^2).

Fixes: #23138
This commit is contained in:
Cristian Adam
2022-04-11 10:50:22 -07:00
committed by Brad King
parent fcf1fcfd0c
commit 476c6a8910
3 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmLocalGenerator.cxx
View File

@@ -2510,12 +2510,12 @@ void cmLocalGenerator::AddPchDependencies(cmGeneratorTarget* target)
static const std::array<std::string, 4> langs = { { "C", "CXX", "OBJC", static const std::array<std::string, 4> langs = { { "C", "CXX", "OBJC",
"OBJCXX" } }; "OBJCXX" } };
bool haveAnyPch = false; std::set<std::string> pchLangSet;
if (this->GetGlobalGenerator()->IsXcode()) { if (this->GetGlobalGenerator()->IsXcode()) {
for (const std::string& lang : langs) { for (const std::string& lang : langs) {
const std::string pchHeader = target->GetPchHeader(config, lang, ""); const std::string pchHeader = target->GetPchHeader(config, lang, "");
if (!pchHeader.empty()) { if (!pchHeader.empty()) {
haveAnyPch = true; pchLangSet.emplace(lang);
} }
} }
} }
@@ -2560,9 +2560,11 @@ void cmLocalGenerator::AddPchDependencies(cmGeneratorTarget* target)
const std::string pchHeader = target->GetPchHeader(config, lang, arch); const std::string pchHeader = target->GetPchHeader(config, lang, arch);
if (pchSource.empty() || pchHeader.empty()) { if (pchSource.empty() || pchHeader.empty()) {
if (this->GetGlobalGenerator()->IsXcode() && haveAnyPch) { if (this->GetGlobalGenerator()->IsXcode() && !pchLangSet.empty()) {
for (auto* sf : sources) { for (auto* sf : sources) {
sf->SetProperty("SKIP_PRECOMPILE_HEADERS", "ON"); if (pchLangSet.find(sf->GetLanguage()) == pchLangSet.end()) {
sf->SetProperty("SKIP_PRECOMPILE_HEADERS", "ON");
}
} }
} }
continue; continue;

17
Tests/RunCMake/PrecompileHeaders/PchIncludedOneLanguage.cmake Normal file
View File

@@ -0,0 +1,17 @@
cmake_minimum_required(VERSION 3.16)
project(PchIncludedAllLanguages C CXX)
if(CMAKE_CXX_COMPILE_OPTIONS_USE_PCH)
add_definitions(-DHAVE_PCH_SUPPORT)
endif()
add_executable(main
main.cpp
empty.c
pch-included.cpp
)
target_precompile_headers(main PRIVATE $<$<COMPILE_LANGUAGE:CXX>:${CMAKE_CURRENT_SOURCE_DIR}/pch.h>)
enable_testing()
add_test(NAME main COMMAND main)

1
Tests/RunCMake/PrecompileHeaders/RunCMakeTest.cmake
View File

@@ -29,4 +29,5 @@ if(RunCMake_GENERATOR MATCHES "Make|Ninja")
endif() endif()
run_test(PchReuseFromObjLib) run_test(PchReuseFromObjLib)
run_test(PchIncludedAllLanguages) run_test(PchIncludedAllLanguages)
run_test(PchIncludedOneLanguage)
run_test(PchLibObjLibExe) run_test(PchLibObjLibExe)