Browse Source

ok fix parenthesis?

pull/3772/head
lizzie 3 days ago
parent
commit
f8c02e20f6
  1. 19
      src/CMakeLists.txt
  2. 3
      src/hid_core/CMakeLists.txt
  3. 3
      src/tests/CMakeLists.txt
  4. 3
      src/video_core/CMakeLists.txt
  5. 3
      src/yuzu/CMakeLists.txt
  6. 3
      src/yuzu_cmd/CMakeLists.txt

19
src/CMakeLists.txt

@ -120,9 +120,8 @@ else()
add_compile_options( add_compile_options(
$<$<COMPILE_LANGUAGE:C,CXX>:-fwrapv> $<$<COMPILE_LANGUAGE:C,CXX>:-fwrapv>
$<$<COMPILE_LANGUAGE:C,CXX>:-pipe> $<$<COMPILE_LANGUAGE:C,CXX>:-pipe>
)
# Disable RTTI (C++ only)
add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>)
# Disable RTTI (C++ only)
$<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>)
endif() endif()
add_compile_options( add_compile_options(
@ -131,27 +130,22 @@ else()
$<$<COMPILE_LANGUAGE:C,CXX>:-Werror=missing-declarations> $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=missing-declarations>
$<$<COMPILE_LANGUAGE:C,CXX>:-Werror=shadow> $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=shadow>
$<$<COMPILE_LANGUAGE:C,CXX>:-Werror=unused> $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=unused>
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-attributes> $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-attributes>
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-invalid-offsetof> $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-invalid-offsetof>
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-parameter> $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-parameter>
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-missing-field-initializers>
)
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-missing-field-initializers>)
if (CXX_CLANG OR CXX_ICC OR CXX_APPLE) # Clang, AppleClang, or Intel C++ if (CXX_CLANG OR CXX_ICC OR CXX_APPLE) # Clang, AppleClang, or Intel C++
if (NOT MSVC) if (NOT MSVC)
add_compile_options( add_compile_options(
$<$<COMPILE_LANGUAGE:C,CXX>:-Werror=shadow-uncaptured-local> $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=shadow-uncaptured-local>
$<$<COMPILE_LANGUAGE:C,CXX>:-Werror=implicit-fallthrough> $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=implicit-fallthrough>
$<$<COMPILE_LANGUAGE:C,CXX>:-Werror=type-limits>
)
$<$<COMPILE_LANGUAGE:C,CXX>:-Werror=type-limits>)
endif() endif()
add_compile_options( add_compile_options(
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-braced-scalar-init> $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-braced-scalar-init>
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-private-field> $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-private-field>
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-nullability-completeness>
)
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-nullability-completeness>)
endif() endif()
if (ARCHITECTURE_x86_64) if (ARCHITECTURE_x86_64)
@ -169,8 +163,7 @@ else()
add_compile_options( add_compile_options(
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-array-bounds> $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-array-bounds>
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-stringop-overread> $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-stringop-overread>
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-stringop-overflow>
)
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-stringop-overflow>)
endif() endif()
# Set file offset size to 64 bits. # Set file offset size to 64 bits.

3
src/hid_core/CMakeLists.txt

@ -154,8 +154,7 @@ else()
$<$<COMPILE_LANGUAGE:C,CXX>:-Werror=conversion> $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=conversion>
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-sign-conversion> $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-sign-conversion>
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-cast-function-type> $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-cast-function-type>
$<$<CXX_COMPILER_ID:Clang>:-fsized-deallocation>
)
$<$<CXX_COMPILER_ID:Clang>:-fsized-deallocation>)
endif() endif()
create_target_directory_groups(hid_core) create_target_directory_groups(hid_core)

3
src/tests/CMakeLists.txt

@ -35,6 +35,5 @@ if (NOT MSVC)
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-conversion> $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-conversion>
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-variable> $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-variable>
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-parameter> $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-parameter>
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-missing-field-initializers>
)
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-missing-field-initializers>)
endif() endif()

3
src/video_core/CMakeLists.txt

@ -365,8 +365,7 @@ else()
# error: implicit conversion loses integer precision: 'int' to 'boost::icl::bound_type' (aka 'unsigned char') # error: implicit conversion loses integer precision: 'int' to 'boost::icl::bound_type' (aka 'unsigned char')
target_compile_options(video_core PRIVATE target_compile_options(video_core PRIVATE
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-shadow> $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-shadow>
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-local-typedef>
)
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-local-typedef>)
else() else()
target_compile_options(video_core PRIVATE $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=conversion>) target_compile_options(video_core PRIVATE $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=conversion>)
endif() endif()

3
src/yuzu/CMakeLists.txt

@ -446,8 +446,7 @@ if (NOT MSVC AND (APPLE OR NOT YUZU_STATIC_BUILD))
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-conversion> $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-conversion>
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-variable> $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-variable>
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-parameter> $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-parameter>
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-missing-field-initializers>
)
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-missing-field-initializers>)
endif() endif()
# Remember that the linker is incredibly stupid. # Remember that the linker is incredibly stupid.

3
src/yuzu_cmd/CMakeLists.txt

@ -63,6 +63,5 @@ if (NOT MSVC)
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-conversion> $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-conversion>
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-variable> $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-variable>
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-parameter> $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-parameter>
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-missing-field-initializers>
)
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-missing-field-initializers>)
endif() endif()
Loading…
Cancel
Save