[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / libflac / fix-compile-options.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c83dd83..2d1a7e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,9 +82,11 @@ if(HAVE_WERROR_FLAG)
     option(ENABLE_WERROR "Enable -Werror in all Makefiles" OFF)
 endif()
 
+if(MSVC AND NOT WITH_ASM)
+    add_compile_options(/wd4267 /wd4996)
+endif()
+
 add_compile_options(
-    $<$<BOOL:${MSVC}>:/wd4267>
-    $<$<BOOL:${MSVC}>:/wd4996>
     $<$<BOOL:${ENABLE_WERROR}>:-Werror>
     $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<BOOL:${HAVE_WEFFCXX_FLAG}>>:-Weffc++>
     $<$<AND:$<COMPILE_LANGUAGE:C>,$<BOOL:${HAVE_DECL_AFTER_STMT_FLAG}>>:-Wdeclaration-after-statement>)
Commit	Line	Data
1e59de90 TL	1	diff --git a/CMakeLists.txt b/CMakeLists.txt
	2	index c83dd83..2d1a7e6 100644
	3	--- a/CMakeLists.txt
	4	+++ b/CMakeLists.txt
	5	@@ -82,9 +82,11 @@ if(HAVE_WERROR_FLAG)
	6	option(ENABLE_WERROR "Enable -Werror in all Makefiles" OFF)
	7	endif()
	8
	9	+if(MSVC AND NOT WITH_ASM)
	10	+ add_compile_options(/wd4267 /wd4996)
	11	+endif()
	12	+
	13	add_compile_options(
	14	- $<$<BOOL:${MSVC}>:/wd4267>
	15	- $<$<BOOL:${MSVC}>:/wd4996>
	16	$<$<BOOL:${ENABLE_WERROR}>:-Werror>
	17	$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<BOOL:${HAVE_WEFFCXX_FLAG}>>:-Weffc++>
	18	$<$<AND:$<COMPILE_LANGUAGE:C>,$<BOOL:${HAVE_DECL_AFTER_STMT_FLAG}>>:-Wdeclaration-after-statement>)