Align git-sync-deps and CMake to use external/SPIRV-Headers by default

This should help with avoiding mistakes such as the one that happened under KhronosGroup#4958. Signed-off-by: Kevin Petit <kevin.petit@arm.com> Change-Id: I922f02e25c507f3412e0e7a99f525fb617b2d426
kpet · Oct 27, 2022 · 49a8d2a · 49a8d2a
1 parent 1cecf91
commit 49a8d2a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/DEPS b/DEPS
@@ -19,7 +19,7 @@ deps = {
   'external/re2':
       Var('github') + '/google/re2.git@' + Var('re2_revision'),
 
-  'external/spirv-headers':
+  'external/SPIRV-Headers':
       Var('github') +  '/KhronosGroup/SPIRV-Headers.git@' +
           Var('spirv_headers_revision'),
 }

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -30,11 +30,7 @@ if (DEFINED SPIRV-Headers_SOURCE_DIR)
   # This allows flexible position of the SPIRV-Headers repo.
   set(SPIRV_HEADER_DIR ${SPIRV-Headers_SOURCE_DIR})
 else()
-  if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/SPIRV-Headers)
-    set(SPIRV_HEADER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/SPIRV-Headers)
-  else()
-    set(SPIRV_HEADER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/spirv-headers)
-  endif()
+  set(SPIRV_HEADER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/SPIRV-Headers)
 endif()
 
 if (IS_DIRECTORY ${SPIRV_HEADER_DIR})