From: sfan5 Date: Tue, 12 Sep 2023 21:38:47 +0000 (+0200) Subject: cmake: Only search for MASM when using MSVC X-Git-Tag: upstream/1.3.268~32 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e2e3cb97b889826405ca0d82089cc5079e6bf6d3;p=platform%2Fupstream%2FVulkan-Loader.git cmake: Only search for MASM when using MSVC --- diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5df9ad10..f7c3f2e8 100644 --- 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 30af7de8..47c9cd70 100644 --- 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)