Merge pull request #1932 from zoddicus/anotherSemiColonFix
Fix config issues and revert previous fixes for semi-colon issues
diff --git a/BUILD.gn b/BUILD.gn
index b2878af..77d596e 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -159,7 +159,7 @@
}
if (is_clang) {
- cflags_cc = [
+ cflags = [
"-Wno-extra-semi",
"-Wno-ignored-qualifiers",
"-Wno-implicit-fallthrough",
@@ -168,7 +168,6 @@
"-Wno-unused-variable",
"-Wno-missing-field-initializers",
"-Wno-newline-eof",
- "-Wextra-semi",
]
}
if (is_win && !is_clang) {
@@ -182,6 +181,9 @@
"${spirv_tools_dir}:spvtools_opt",
"${spirv_tools_dir}:spvtools_val",
]
+
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [ "//build/config/compiler:no_chromium_code" ]
}
source_set("glslang_default_resource_limits_sources") {
@@ -193,6 +195,9 @@
":glslang_sources",
]
public_configs = [ ":glslang_public" ]
+
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [ "//build/config/compiler:no_chromium_code" ]
}
executable("glslang_validator") {
@@ -208,6 +213,9 @@
":glslang_default_resource_limits_sources",
":glslang_sources",
]
+
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [ "//build/config/compiler:no_chromium_code" ]
}
executable("spirv-remap") {
@@ -218,4 +226,7 @@
deps = [
":glslang_sources",
]
+
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [ "//build/config/compiler:no_chromium_code" ]
}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbdd1c5..623045e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,12 +92,12 @@
if(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
add_compile_options(-Wall -Wmaybe-uninitialized -Wuninitialized -Wunused -Wunused-local-typedefs
- -Wunused-parameter -Wunused-value -Wunused-variable -Wunused-but-set-parameter -Wunused-but-set-variable -fno-exceptions)
+ -Wunused-parameter -Wunused-value -Wunused-variable -Wunused-but-set-parameter -Wunused-but-set-variable -fno-exceptions)
add_compile_options(-Wno-reorder) # disable this from -Wall, since it happens all over.
add_compile_options(-fno-rtti)
elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
add_compile_options(-Wall -Wuninitialized -Wunused -Wunused-local-typedefs
- -Wunused-parameter -Wunused-value -Wunused-variable -Wextra-semi)
+ -Wunused-parameter -Wunused-value -Wunused-variable)
add_compile_options(-Wno-reorder) # disable this from -Wall, since it happens all over.
add_compile_options(-fno-rtti)
elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "MSVC")