From f31c10971f7cca67ecb4eb2b1959ebabfa38470b Mon Sep 17 00:00:00 2001 From: juan-lunarg Date: Tue, 23 May 2023 16:02:16 -0600 Subject: icd: Fix WIN32 Mock ICD installation Mock isn't a typical library. It's a loadable module which should be installed in the bin folder for Windows users. This is consistent with how we treat other modules. --- .github/workflows/tools.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml index 6027666b..5da83e50 100644 --- a/.github/workflows/tools.yml +++ b/.github/workflows/tools.yml @@ -63,7 +63,7 @@ jobs: with: key: ${{ runner.os }}-${{ matrix.config }}-${{ matrix.cc }}-${{matrix.cube_wsi}} - name: Configure - run: cmake -S. -B build -DCMAKE_BUILD_TYPE=${{matrix.config}} -DCUBE_WSI_SELECTION=${{matrix.cube_wsi}} -D UPDATE_DEPS=ON -G "Ninja" + run: cmake -S. -B build -G "Ninja" -DCMAKE_BUILD_TYPE=${{matrix.config}} -DCUBE_WSI_SELECTION=${{matrix.cube_wsi}} -D UPDATE_DEPS=ON -D INSTALL_ICD=ON env: CC: ${{matrix.cc}} CXX: ${{matrix.cxx}} @@ -73,6 +73,9 @@ jobs: - name: Build run: cmake --build build + - name: Install + run: cmake --install build/ --prefix build/install + - name: Verify generated source files run: python scripts/generate_source.py --verify external/${{ matrix.config }}/Vulkan-Headers/build/install/share/vulkan/registry @@ -96,11 +99,14 @@ jobs: arch: ${{ matrix.arch }} - name: Configure - run: cmake -S. -B build -DCMAKE_BUILD_TYPE=${{matrix.config}} -D UPDATE_DEPS=ON -G "Ninja" + run: cmake -S. -B build -G "Ninja" -DCMAKE_BUILD_TYPE=${{matrix.config}} -D UPDATE_DEPS=ON -D INSTALL_ICD=ON - name: Build run: cmake --build ./build + - name: Install + run: cmake --install build/ --prefix build/install + - name: Verify generated source files run: python scripts/generate_source.py --verify external/${{matrix.config}}/Vulkan-Headers/build/install/share/vulkan/registry @@ -123,7 +129,7 @@ jobs: run: echo "/usr/lib/ccache:/usr/local/opt/ccache/libexec" >> $GITHUB_PATH - name: Configure - run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -D UPDATE_DEPS=ON -G "Ninja" + run: cmake -S. -B build -G "Ninja" -DCMAKE_BUILD_TYPE=Release -D UPDATE_DEPS=ON -D INSTALL_ICD=ON env: MACOSX_DEPLOYMENT_TARGET: 10.15 -- cgit v1.2.3