mirror of
https://gitlab.kitware.com/cmake/cmake.git
synced 2026-01-26 11:04:33 +00:00
Merge topic 'bootstrap-devirtualization' into release-4.1
ea04e19daf bootstrap: Fix compilation with gcc 16 devirtualization Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !11243
This commit is contained in:
commit
7ef733450c
@ -130,12 +130,12 @@
|
||||
# include "cmExtraEclipseCDT4Generator.h"
|
||||
# include "cmExtraKateGenerator.h"
|
||||
# include "cmExtraSublimeTextGenerator.h"
|
||||
#endif
|
||||
|
||||
// NOTE: the __linux__ macro is predefined on Android host too, but
|
||||
// main CMakeLists.txt filters out this generator by host name.
|
||||
#if (defined(__linux__) && !defined(__ANDROID__)) || defined(_WIN32)
|
||||
# include "cmGlobalGhsMultiGenerator.h"
|
||||
# if (defined(__linux__) && !defined(__ANDROID__)) || defined(_WIN32)
|
||||
# include "cmGlobalGhsMultiGenerator.h"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#if defined(__APPLE__)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user