Fix msvc.cmake overwriting user TBB_COMMON_COMPILE_FLAGS values (#1217)

Most other /cmake/compilers/...cmake files preserve any user-supplied flags. This change brings use of MSVC compile settings in to line with the documented behaviour of TBB_COMMON_COMPILE_FLAGS in - https://github.com/oneapi-src/oneTBB/blob/master/cmake/README.md#cmake-files Signed-off-by: Dan Hawson <[email protected]>
uxlfoundation · Sep 27, 2023 · fd1590c · fd1590c
1 parent 7eb68ae
commit fd1590c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cmake/compilers/MSVC.cmake b/cmake/compilers/MSVC.cmake
@@ -33,7 +33,7 @@ if (MSVC_VERSION LESS_EQUAL 1900)
     set(TBB_TEST_COMPILE_FLAGS ${TBB_TEST_COMPILE_FLAGS} /wd4503)
 endif()
 set(TBB_LIB_COMPILE_FLAGS -D_CRT_SECURE_NO_WARNINGS /GS)
-set(TBB_COMMON_COMPILE_FLAGS /volatile:iso /FS /EHsc)
+set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} /volatile:iso /FS /EHsc)
 
 set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} /DYNAMICBASE /NXCOMPAT)