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

VERIFY_INTERFACE_HEADER_SETS: Finalize compile info for verify targets

Browse Source 
Fixes: #23732
This commit is contained in:
Kyle Edwards
2022-07-27 12:08:11 -04:00
parent 626e641a19
commit 27fd172d8d
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmGeneratorTarget.cxx
View File

@@ -16,6 +16,7 @@
#include <utility> #include <utility>
#include <cm/memory> #include <cm/memory>
#include <cm/optional>
#include <cm/string_view> #include <cm/string_view>
#include <cmext/algorithm> #include <cmext/algorithm>
#include <cmext/string_view> #include <cmext/string_view>
@@ -8616,6 +8617,11 @@ bool cmGeneratorTarget::AddHeaderSetVerification()
verifyTarget->SetProperty("AUTOUIC", "OFF"); verifyTarget->SetProperty("AUTOUIC", "OFF");
verifyTarget->SetProperty("DISABLE_PRECOMPILE_HEADERS", "ON"); verifyTarget->SetProperty("DISABLE_PRECOMPILE_HEADERS", "ON");
verifyTarget->SetProperty("UNITY_BUILD", "OFF"); verifyTarget->SetProperty("UNITY_BUILD", "OFF");
cm::optional<std::map<std::string, cmValue>>
perConfigCompileDefinitions;
verifyTarget->FinalizeTargetCompileInfo(
this->Makefile->GetCompileDefinitionsEntries(),
perConfigCompileDefinitions);
} }
if (fileCgesContextSensitive) { if (fileCgesContextSensitive) {

2
Tests/RunCMake/VerifyHeaderSets/VerifyHeaderSets.cmake
View File

@@ -1,5 +1,7 @@
enable_language(C CXX) enable_language(C CXX)
add_compile_definitions(TEST_ADD_COMPILE_DEFINITIONS)
set_property(SOURCE a.h PROPERTY LANGUAGE C) set_property(SOURCE a.h PROPERTY LANGUAGE C)
set_property(SOURCE dir/c.h PROPERTY LANGUAGE C) set_property(SOURCE dir/c.h PROPERTY LANGUAGE C)
set_property(SOURCE dir/cxx.h PROPERTY LANGUAGE CXX) set_property(SOURCE dir/cxx.h PROPERTY LANGUAGE CXX)

4
Tests/RunCMake/VerifyHeaderSets/a.h
View File

@@ -2,4 +2,8 @@
# error "TEST_A_H defined" # error "TEST_A_H defined"
#endif #endif
#ifndef TEST_ADD_COMPILE_DEFINITIONS
# error "TEST_ADD_COMPILE_DEFINITIONS not defined"
#endif
extern void a_h(void); extern void a_h(void);