fix ci

K1ngst0m · Oct 28, 2023 · 6c5e964 · 6c5e964
1 parent 2d1a6aa
commit 6c5e964
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -10,6 +10,7 @@ target_include_directories(resource PRIVATE
   ${APH_EXTERNAL_DIR}/tinydds
   ${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
@@ -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
@@ -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)