Przeglądaj źródła

Merge topic 'bootstrap-devirtualization' into release-4.1

ea04e19daf bootstrap: Fix compilation with gcc 16 devirtualization

Acked-by: Kitware Robot <[email protected]>
Merge-request: !11243
Brad King 3 miesięcy temu
rodzic
commit
7ef733450c
1 zmienionych plików z 3 dodań i 3 usunięć
  1. 3 3
      Source/cmake.cxx

+ 3 - 3
Source/cmake.cxx

@@ -130,12 +130,12 @@
 #  include "cmExtraEclipseCDT4Generator.h"
 #  include "cmExtraEclipseCDT4Generator.h"
 #  include "cmExtraKateGenerator.h"
 #  include "cmExtraKateGenerator.h"
 #  include "cmExtraSublimeTextGenerator.h"
 #  include "cmExtraSublimeTextGenerator.h"
-#endif
 
 
 // NOTE: the __linux__ macro is predefined on Android host too, but
 // NOTE: the __linux__ macro is predefined on Android host too, but
 // main CMakeLists.txt filters out this generator by host name.
 // 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
 #endif
 
 
 #if defined(__APPLE__)
 #if defined(__APPLE__)