From 492d804307623c542b352d4cd79bd52826e81f13 Mon Sep 17 00:00:00 2001
From: K1ngst0m <kingstom.chen@gmail.com>
Date: Sat, 28 Oct 2023 18:35:41 +0800
Subject: [PATCH] fix ci

---
 cmake/AphDefinitions.cmake     | 1 -
 engine/CMakeLists.txt          | 5 -----
 engine/api/CMakeLists.txt      | 3 ++-
 engine/cli/CMakeLists.txt      | 1 +
 engine/common/CMakeLists.txt   | 2 ++
 engine/renderer/CMakeLists.txt | 2 +-
 engine/resource/CMakeLists.txt | 2 ++
 engine/threads/CMakeLists.txt  | 1 +
 engine/wsi/CMakeLists.txt      | 3 ++-
 9 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/cmake/AphDefinitions.cmake b/cmake/AphDefinitions.cmake
index 18fd3d47..f62ab4ed 100644
--- a/cmake/AphDefinitions.cmake
+++ b/cmake/AphDefinitions.cmake
@@ -1,6 +1,5 @@
 include_guard()
 
-set(APH_ROOT_DIR ${CMAKE_SOURCE_DIR})
 set(APH_EXAMPLES_DIR ${APH_ROOT_DIR}/examples)
 set(APH_ENGINE_DIR ${APH_ROOT_DIR}/engine)
 set(APH_EXTERNAL_DIR ${APH_ROOT_DIR}/external)
diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
index a155a543..1e465c9c 100644
--- a/engine/CMakeLists.txt
+++ b/engine/CMakeLists.txt
@@ -18,13 +18,8 @@ target_link_libraries(aph_engine INTERFACE common app cli threads wsi resource a
 
 target_link_libraries(aph_engine INTERFACE
   mimalloc-static
-  glfw
-  imgui
   ${xcb_libraries}
   ${cmake_thread_libs_init}
-  volk
-  shaderc_shared
-  spirv-cross-core
   dl
   dw
 )
diff --git a/engine/api/CMakeLists.txt b/engine/api/CMakeLists.txt
index cc373b5f..89e48b5a 100644
--- a/engine/api/CMakeLists.txt
+++ b/engine/api/CMakeLists.txt
@@ -6,5 +6,6 @@ target_include_directories(api PRIVATE
   ${APH_EXTERNAL_DIR}/volk
   ${APH_EXTERNAL_DIR}/spirv-cross
   ${APH_EXTERNAL_DIR}/vulkan
+  ${APH_EXTERNAL_DIR}/glm
 )
-target_link_libraries(api PRIVATE common threads volk)
+target_link_libraries(api PRIVATE common threads volk shaderc_shared spirv-cross-core)
diff --git a/engine/cli/CMakeLists.txt b/engine/cli/CMakeLists.txt
index 4db75395..e8c60214 100644
--- a/engine/cli/CMakeLists.txt
+++ b/engine/cli/CMakeLists.txt
@@ -3,4 +3,5 @@ add_library(cli STATIC ${API_CLI_SRC})
 aph_compiler_options(cli)
 target_include_directories(cli PRIVATE
   ${APH_ENGINE_DIR}
+  ${APH_EXTERNAL_DIR}/glm
 )
diff --git a/engine/common/CMakeLists.txt b/engine/common/CMakeLists.txt
index 688f26f0..2dffc95c 100644
--- a/engine/common/CMakeLists.txt
+++ b/engine/common/CMakeLists.txt
@@ -4,4 +4,6 @@ aph_compiler_options(common)
 target_include_directories(common PRIVATE
   ${APH_ENGINE_DIR}
   ${APH_EXTERNAL_DIR}/backward-cpp/include
+  ${APH_EXTERNAL_DIR}/glm
+  ${APH_EXTERNAL_DIR}/stb/include
 )
diff --git a/engine/renderer/CMakeLists.txt b/engine/renderer/CMakeLists.txt
index d3dfe91d..ee082b96 100644
--- a/engine/renderer/CMakeLists.txt
+++ b/engine/renderer/CMakeLists.txt
@@ -10,4 +10,4 @@ target_include_directories(renderer PRIVATE
   ${APH_EXTERNAL_DIR}/imgui
   ${APH_EXTERNAL_DIR}/glm
 )
-target_link_libraries(renderer PRIVATE api)
+target_link_libraries(renderer PRIVATE api imgui)
diff --git a/engine/resource/CMakeLists.txt b/engine/resource/CMakeLists.txt
index ccf3f267..86c45c54 100644
--- a/engine/resource/CMakeLists.txt
+++ b/engine/resource/CMakeLists.txt
@@ -8,8 +8,10 @@ target_include_directories(resource PRIVATE
   ${APH_EXTERNAL_DIR}/slang
   ${APH_EXTERNAL_DIR}/tinyktx
   ${APH_EXTERNAL_DIR}/tinydds
+  ${APH_EXTERNAL_DIR}/shaderc/libshaderc/include
   ${APH_EXTERNAL_DIR}/tinygltf/include
   ${APH_EXTERNAL_DIR}/stb/include
+  ${APH_EXTERNAL_DIR}/glm
 )
 
 target_link_libraries(resource PRIVATE slang)
diff --git a/engine/threads/CMakeLists.txt b/engine/threads/CMakeLists.txt
index e4f518db..00781f12 100644
--- a/engine/threads/CMakeLists.txt
+++ b/engine/threads/CMakeLists.txt
@@ -3,4 +3,5 @@ add_library(threads STATIC ${API_THREADS_SRC})
 aph_compiler_options(threads)
 target_include_directories(threads PRIVATE
   ${APH_ENGINE_DIR}
+  ${APH_EXTERNAL_DIR}/glm
 )
diff --git a/engine/wsi/CMakeLists.txt b/engine/wsi/CMakeLists.txt
index 4f3be5fd..5b0937fd 100644
--- a/engine/wsi/CMakeLists.txt
+++ b/engine/wsi/CMakeLists.txt
@@ -5,6 +5,7 @@ target_include_directories(wsi PRIVATE
   ${APH_ENGINE_DIR}
   ${APH_EXTERNAL_DIR}/volk
   ${APH_EXTERNAL_DIR}/imgui
+  ${APH_EXTERNAL_DIR}/glm
 )
 
-target_link_libraries(wsi PRIVATE imgui)
+target_link_libraries(wsi PRIVATE imgui glfw)