Move khronos headers to source_third_party

ARM-software · Jan 12, 2025 · db7500b · db7500b
1 parent 05f9209
commit db7500b
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 13 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,11 +1,11 @@
 [submodule "khronos/vulkan"]
-	path = khronos/vulkan
+	path = source_third_party/khronos/vulkan
 	url = https://github.com/KhronosGroup/Vulkan-Headers
 [submodule "khronos/opengles"]
-	path = khronos/opengles
+	path = source_third_party/khronos/opengles
 	url = https://github.com/KhronosGroup/OpenGL-Registry
 [submodule "khronos/egl"]
-	path = khronos/egl
+	path = source_third_party/khronos/egl
 	url = https://github.com/KhronosGroup/EGL-Registry
 [submodule "source_third_party/gtest"]
 	path = source_third_party/gtest

diff --git a/generator/vk_codegen/source_CMakeLists.txt b/generator/vk_codegen/source_CMakeLists.txt
@@ -53,7 +53,7 @@ target_include_directories(
 
 target_include_directories(
     ${VK_LAYER} SYSTEM PRIVATE
-        ../../khronos/vulkan/include)
+        ${PROJECT_SOURCE_DIR}/../source_third_party/khronos/vulkan/include)
 
 lgl_set_build_options(${VK_LAYER})
 

diff --git a/layer_example/source/CMakeLists.txt b/layer_example/source/CMakeLists.txt
@@ -54,7 +54,7 @@ target_include_directories(
 
 target_include_directories(
     ${VK_LAYER} SYSTEM PRIVATE
-        ../../khronos/vulkan/include)
+        ${PROJECT_SOURCE_DIR}/../source_third_party/khronos/vulkan/include)
 
 lgl_set_build_options(${VK_LAYER})
 

diff --git a/layer_gpu_support/source/CMakeLists.txt b/layer_gpu_support/source/CMakeLists.txt
@@ -60,7 +60,7 @@ target_include_directories(
 target_include_directories(
     ${VK_LAYER} SYSTEM PRIVATE
         ${PROJECT_SOURCE_DIR}/../source_third_party
-        ${PROJECT_SOURCE_DIR}/../khronos/vulkan/include)
+        ${PROJECT_SOURCE_DIR}/../source_third_party/khronos/vulkan/include)
 
 lgl_set_build_options(${VK_LAYER})
 

diff --git a/layer_gpu_timeline/source/CMakeLists.txt b/layer_gpu_timeline/source/CMakeLists.txt
@@ -64,7 +64,7 @@ target_include_directories(
 target_include_directories(
     ${VK_LAYER} SYSTEM PRIVATE
         ${PROJECT_SOURCE_DIR}/../source_third_party
-        ${PROJECT_SOURCE_DIR}/../khronos/vulkan/include)
+        ${PROJECT_SOURCE_DIR}/../source_third_party/khronos/vulkan/include)
 
 lgl_set_build_options(${VK_LAYER})
 

diff --git a/source_common/comms/test/CMakeLists.txt b/source_common/comms/test/CMakeLists.txt
@@ -66,9 +66,9 @@ target_link_libraries(
 
 # Exclude from ctest for now because it needs user to manually run the
 # external server program before the test can pass
-#add_test(
-#    NAME ${TEST_BINARY}
-#    COMMAND ${TEST_BINARY})
+# add_test(
+#     NAME ${TEST_BINARY}
+#     COMMAND ${TEST_BINARY})
 
 install(
     TARGETS ${TEST_BINARY}

diff --git a/source_common/framework/CMakeLists.txt b/source_common/framework/CMakeLists.txt
@@ -40,7 +40,7 @@ target_include_directories(
 target_include_directories(
     ${LIB_BINARY} SYSTEM PRIVATE
         ${PROJECT_SOURCE_DIR}/../source_third_party
-        ${PROJECT_SOURCE_DIR}/../khronos/vulkan/include
+        ${PROJECT_SOURCE_DIR}/../source_third_party/khronos/vulkan/include
         ../)
 
 lgl_set_build_options(${LIB_BINARY})
diff --git a/source_common/trackers/CMakeLists.txt b/source_common/trackers/CMakeLists.txt
@@ -33,8 +33,8 @@ add_library(
 
 target_include_directories(
     ${LIB_BINARY} PRIVATE
-        ../../khronos/vulkan/include
-        ../../source_third_party
+        ${PROJECT_SOURCE_DIR}/../source_third_party/
+        ${PROJECT_SOURCE_DIR}/../source_third_party/khronos/vulkan/include
         ../)
 
 lgl_set_build_options(${LIB_BINARY})

diff --git a/khronos/egl → source_third_party/khronos/egl b/khronos/egl → source_third_party/khronos/egl
diff --git a/khronos/opengles → source_third_party/khronos/opengles b/khronos/opengles → source_third_party/khronos/opengles
diff --git a/khronos/vulkan → source_third_party/khronos/vulkan b/khronos/vulkan → source_third_party/khronos/vulkan