Fix windows tests build and multi workflow

Signed-off-by: Neil R. Spruit <[email protected]>
oneapi-src · Nov 15, 2024 · 40c9586 · 40c9586
1 parent 19acc7e
commit 40c9586
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/build-multi-static.yml b/.github/workflows/build-multi-static.yml
@@ -148,6 +148,7 @@ jobs:
         	  -D CMAKE_C_COMPILER_LAUNCHER=ccache \
         	  -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
         	  -D CMAKE_BUILD_TYPE=Release \
+        	  -D BUILD_STATIC=1 \
         	  -D CMAKE_INSTALL_PREFIX=${{ matrix.target == 'install' && '../level-zero-install' || matrix.target == 'package' && '/usr' || '' }} \
         	  -D CPACK_OUTPUT_FILE_PREFIX=${MOUNT_TARGET}/level-zero-package \
         	  ..

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -14,7 +14,7 @@ target_link_libraries(
 
 # For some reason the MSVC runtime libraries used by googletest and test
 # binaries don't match, so force the test binary to use the dynamic runtime.
-if(MSVC)
+if(MSVC and not BUILD_STATIC
     target_compile_options(tests PRIVATE "/MD$<$<CONFIG:Debug>:d>")
 endif()