cmake: Only search for MASM when using MSVC

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5df9ad10782031914dd4b5ea2d2ff8ab3666a74b..f7c3f2e87a3f6f92f8c13484972feb312a114007 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -465,7 +465,7 @@ jobs:
         - name: GCC Version
           run: gcc --version # If this fails MINGW is not setup correctly
         - name: Configure
-          run: cmake -S. -B build -D UPDATE_DEPS=ON -D CMAKE_BUILD_TYPE=Release -D USE_MASM=OFF -D ENABLE_WERROR=ON
+          run: cmake -S. -B build -D UPDATE_DEPS=ON -D CMAKE_BUILD_TYPE=Release -D ENABLE_WERROR=ON
           env:
             LDFLAGS: -fuse-ld=lld # MINGW linking is very slow. Use llvm linker instead.
             CMAKE_C_COMPILER_LAUNCHER: ccache

diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
index 30af7de814aa64cb84c302dd0c7ee53eaaf13829..47c9cd7073c1ff006959a44ccb5f787c79d0fe24 100644 (file)
--- a/loader/CMakeLists.txt
+++ b/loader/CMakeLists.txt
@@ -130,6 +130,9 @@ if(WIN32)
             endif()
         endif()
     endif()
+    if (NOT MSVC)
+        set(USE_MASM OFF)
+    endif ()
     option(USE_MASM "Use MASM" ON)
     if (USE_MASM)
       enable_language(ASM_MASM)