chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only use -Wgnu-empty-initializer on Clang and not GCC.

Browse Source 
Broken by ee566eb880.

PiperOrigin-RevId: 517390165
Change-Id: Ibd8ec46647873050899cffe435e3f5c293279aae
This commit is contained in:
Nimrod Gileadi
2023-03-17 05:34:21 -07:00
committed by Copybara-Service
parent ee566eb880
commit 08027b4e43
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/MujocoOptions.cmake
+3 -1
View File
@@ -93,7 +93,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang
-Wno-int-in-bool-context -Wno-int-in-bool-context
-Wno-sign-compare -Wno-sign-compare
-Wno-unknown-pragmas -Wno-unknown-pragmas
-Wgnu-empty-initializer
) )
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
# Set -Wimplicit-fallthrough=5 to only allow fallthrough annotation via __attribute__. # Set -Wimplicit-fallthrough=5 to only allow fallthrough annotation via __attribute__.
@@ -101,6 +100,9 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang
-Wno-maybe-uninitialized -Wno-maybe-uninitialized
) )
endif() endif()
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT MSVC)
set(EXTRA_COMPILE_OPTIONS ${EXTRA_COMPILE_OPTIONS} -Wgnu-empty-initializer)
endif()
endif() endif()
if(WIN32) if(WIN32)
sample/cmake/SampleOptions.cmake
+3 -1
View File
@@ -93,7 +93,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang
-Wno-int-in-bool-context -Wno-int-in-bool-context
-Wno-sign-compare -Wno-sign-compare
-Wno-unknown-pragmas -Wno-unknown-pragmas
-Wgnu-empty-initializer
) )
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
# Set -Wimplicit-fallthrough=5 to only allow fallthrough annotation via __attribute__. # Set -Wimplicit-fallthrough=5 to only allow fallthrough annotation via __attribute__.
@@ -101,6 +100,9 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang
-Wno-maybe-uninitialized -Wno-maybe-uninitialized
) )
endif() endif()
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT MSVC)
set(EXTRA_COMPILE_OPTIONS ${EXTRA_COMPILE_OPTIONS} -Wgnu-empty-initializer)
endif()
endif() endif()
if(WIN32) if(WIN32)
simulate/cmake/SimulateOptions.cmake
+3 -1
View File
@@ -93,7 +93,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang
-Wno-int-in-bool-context -Wno-int-in-bool-context
-Wno-sign-compare -Wno-sign-compare
-Wno-unknown-pragmas -Wno-unknown-pragmas
-Wgnu-empty-initializer
) )
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
# Set -Wimplicit-fallthrough=5 to only allow fallthrough annotation via __attribute__. # Set -Wimplicit-fallthrough=5 to only allow fallthrough annotation via __attribute__.
@@ -101,6 +100,9 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang
-Wno-maybe-uninitialized -Wno-maybe-uninitialized
) )
endif() endif()
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT MSVC)
set(EXTRA_COMPILE_OPTIONS ${EXTRA_COMPILE_OPTIONS} -Wgnu-empty-initializer)
endif()
endif() endif()
if(WIN32) if(WIN32)