ref: make build clangcl compatible

getsentry · Apr 19, 2023 · 5cc8bf2 · 5cc8bf2
1 parent 1230009
commit 5cc8bf2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 21 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,7 +10,7 @@ endif()
 
 #read sentry-native version
 file(READ "include/sentry.h" _SENTRY_HEADER_CONTENT)
-string(REGEX MATCH "#define SENTRY_SDK_VERSION \"([0-9\.]+)\"" _SENTRY_VERSION_MATCH "${_SENTRY_HEADER_CONTENT}")
+string(REGEX MATCH "#define SENTRY_SDK_VERSION \"([0-9.]+)\"" _SENTRY_VERSION_MATCH "${_SENTRY_HEADER_CONTENT}")
 set(SENTRY_VERSION "${CMAKE_MATCH_1}")
 unset(_SENTRY_HEADER_CONTENT)
 unset(_SENTRY_VERSION_MATCH)
@@ -300,9 +300,7 @@ if(MSVC)
 		set(CMAKE_ASM_MASM_FLAGS "${CMAKE_ASM_MASM_FLAGS} /safeseh")
 	endif()
 
-	# using `/Wall` is not feasible, as it spews tons of warnings from windows headers
-	# supress C5105, introduced in VS 16.8, which breaks on the Windows SDKs own `winbase.h` header
-	target_compile_options(sentry PRIVATE $<BUILD_INTERFACE:/W4 /wd5105>)
+	target_compile_options(sentry PRIVATE $<BUILD_INTERFACE:/W4>)
 	# ignore all warnings for mpack
 	set_source_files_properties(
 		"${PROJECT_SOURCE_DIR}/vendor/mpack.c"
@@ -578,15 +576,12 @@ if(SENTRY_BUILD_EXAMPLES)
 	add_executable(sentry_example examples/example.c)
 	target_link_libraries(sentry_example PRIVATE sentry)
 
-	if(MSVC)
-		target_compile_options(sentry_example PRIVATE $<BUILD_INTERFACE:/wd5105>)
-		if(CRASHPAD_WER_ENABLED)
-			# to test handling SEH by-passing exceptions we need to enable the control flow guard
-			target_compile_options(sentry_example PRIVATE $<BUILD_INTERFACE:/guard:cf>)
-		endif()
+	if(CRASHPAD_WER_ENABLED)
+		# to test handling SEH by-passing exceptions we need to enable the control flow guard
+		target_compile_options(sentry_example PRIVATE $<BUILD_INTERFACE:/guard:cf>)
 	endif()
 
-	# set static runtime if enabled
+	# set static runtime if enablede
 	if(SENTRY_BUILD_RUNTIMESTATIC AND MSVC)
 		set_property(TARGET sentry_example PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 	endif()

diff --git a/external/crashpad b/external/crashpad
diff --git a/src/sentry_core.h b/src/sentry_core.h
@@ -15,7 +15,7 @@
 #    define MUST_USE
 #endif
 
-#if defined(__GNUC__)
+#if defined(__GNUC__) || (defined(_MSC_VER) && __clang__)
 #    define UNUSED(x) UNUSED_##x __attribute__((__unused__))
 #elif defined(_MSC_VER)
 #    define UNUSED(x) UNUSED_##x __pragma(warning(suppress : 4100))

diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
@@ -73,10 +73,6 @@ if(MINGW)
 	)
 endif()
 
-if(MSVC)
-	target_compile_options(sentry_test_unit PRIVATE $<BUILD_INTERFACE:/wd5105>)
-endif()
-
 # set static runtime if enabled
 if(SENTRY_BUILD_RUNTIMESTATIC AND MSVC)
 	set_property(TARGET sentry_test_unit PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
@@ -103,10 +99,6 @@ target_link_libraries(sentry_fuzz_json PRIVATE
 	"$<$<PLATFORM_ID:Linux>:rt>"
 )
 
-if(MSVC)
-	target_compile_options(sentry_fuzz_json PRIVATE $<BUILD_INTERFACE:/wd5105>)
-endif()
-
 # set static runtime if enabled
 if (SENTRY_BUILD_RUNTIMESTATIC AND MSVC)
     set_property(TARGET sentry_fuzz_json PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+10 −1		client/CMakeLists.txt
+4 −0		compat/CMakeLists.txt
+13 −2		handler/CMakeLists.txt
+10 −1		minidump/CMakeLists.txt
+10 −1		snapshot/CMakeLists.txt
+8 −1		third_party/mini_chromium/CMakeLists.txt
+10 −2		third_party/zlib/CMakeLists.txt
+12 −1		util/CMakeLists.txt