diff options
| author | juan-lunarg <juan@lunarg.com> | 2023-05-23 16:02:16 -0600 |
|---|---|---|
| committer | Juan Ramos <114601453+juan-lunarg@users.noreply.github.com> | 2023-05-23 17:11:22 -0600 |
| commit | f31c10971f7cca67ecb4eb2b1959ebabfa38470b (patch) | |
| tree | e54b7e7d26bc66dcfa1feba08fc6578da2ec3e12 /.github | |
| parent | 80b010b1e1b08c1f092fb2bfa337faadf8ea1ba3 (diff) | |
| download | usermoji-f31c10971f7cca67ecb4eb2b1959ebabfa38470b.tar.xz | |
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.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/tools.yml | 12 |
1 files changed, 9 insertions, 3 deletions
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 |