From 15fca22c12b97acd8e2a39d2690c8ce2e7545b80 Mon Sep 17 00:00:00 2001
From: Sergio Villar Senin <svillar@igalia.com>
Date: Mon, 12 Aug 2024 10:13:29 +0200
Subject: [PATCH] Change location of submodule

---
 .gitmodules                         | 2 +-
 app/CMakeLists.txt                  | 4 ++--
 app/src/{ => main/cpp}/KTX-Software | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename app/src/{ => main/cpp}/KTX-Software (100%)

diff --git a/.gitmodules b/.gitmodules
index fbae2a6d26..a3ab8a1024 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,6 +6,6 @@
 	url = https://github.com/Igalia/tinygltf.git
 	branch = igalia.com/wolvic
 [submodule "app/src/KTX-Software"]
-	path = app/src/KTX-Software
+	path = app/src/main/cpp/KTX-Software
 	url = https://github.com/KhronosGroup/KTX-Software.git
 	branch = 4.2
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index e72d3a51a1..29aceff2ce 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -209,9 +209,9 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/../app/src/main/cpp/tinygltf)
 
 # Add dependency on KTX-Software
-add_subdirectory(${CMAKE_SOURCE_DIR}/src/KTX-Software)
+add_subdirectory(${CMAKE_SOURCE_DIR}/src/main/cpp/KTX-Software)
 target_link_libraries(native-lib ktx_read)
-target_include_directories(native-lib PRIVATE ${CMAKE_SOURCE_DIR}/src/KTX-Software/include)
+target_include_directories(native-lib PRIVATE ${CMAKE_SOURCE_DIR}/src/main/cpp/KTX-Software/include)
 
 # Specifies libraries CMake should link to your target library. You
 # can link multiple libraries, such as libraries you define in this
diff --git a/app/src/KTX-Software b/app/src/main/cpp/KTX-Software
similarity index 100%
rename from app/src/KTX-Software
rename to app/src/main/cpp/KTX-Software