From f87143eb13e0f6ebb3a641286f364337c71355d3 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Fri, 4 Mar 2022 19:06:45 -0500 Subject: [PATCH] Checkout glslang and spirv-cross correctly --- extern/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 815048b..07711bc 100755 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -3,7 +3,7 @@ include(FetchContent) # cmake does not feel like fixing this terrible issue in fetchcontent, so we are going to fix it ourselves. # solution located here: https://gitlab.kitware.com/cmake/cmake/-/issues/21146#note_933303 -if(NOT WINDOWS) +if(NOT WIN32) set(BULLET_PATCH_COMMAND git apply -v --ignore-space-change --ignore-whitespace ${CMAKE_CURRENT_SOURCE_DIR}/fix_bullet_cmake_version.patch || true) endif() @@ -18,14 +18,14 @@ FetchContent_Declare( FetchContent_Declare( spirv-cross GIT_REPOSITORY https://github.com/KhronosGroup/SPIRV-Cross.git - GIT_TAG 188dc8b13c29f8547c8fb52182111c9ada741a70 + GIT_TAG 0e2880ab990e79ce6cc8c79c219feda42d98b1e8 GIT_SHALLOW ON ) FetchContent_Declare( glslang GIT_REPOSITORY https://github.com/KhronosGroup/glslang.git - GIT_TAG d15deba1d8c7da7336945a80eccbf875ae884648 + GIT_TAG 538231d8b46c22474a558671f89f80b25fcec72d GIT_SHALLOW ON )