Skip to content

Commit 928aecf

Browse files
cmake dependency include directory modification
1 parent 45da3ce commit 928aecf

4 files changed

Lines changed: 29 additions & 6 deletions

File tree

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ if (NOT LAUNCHER_ONLY)
7171
)
7272
add_subdirectory (${EXTERNAL_DIR}/Vulkan-Loader)
7373

74+
## Setup Dependencies
75+
76+
include(${EXTERNAL_DIR}/externals.cmake)
77+
7478
# Core engine lib is here
7579
#
7680
add_subdirectory (ZEngine)

Tetragrama/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
include(${EXTERNAL_DIR}/externals.cmake)
2-
31
file (GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
42
file (GLOB_RECURSE CPP_FILES CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
53

ZEngine/ZEngine/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
include(${EXTERNAL_DIR}/externals.cmake)
2-
31
file (GLOB_RECURSE HEADER_FILES_LIST CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
42
file (GLOB_RECURSE CPP_FILES_LIST CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
53
file (GLOB_RECURSE RESOURCE_FILES_LIST CONFIGURE_DEPENDS ${PROJECT_SOURCE_DIR}/../Resources/Shaders/*.*)

__externals/externals.cmake

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ set(EXTERNAL_INCLUDE_DIRS
1818
${EXTERNAL_DIR}/glslang
1919
${EXTERNAL_DIR}/SPIRV-Cross
2020
${EXTERNAL_DIR}/VulkanMemoryAllocator
21-
${EXTERNAL_DIR}/nlohmann_json/single_include
22-
${EXTERNAL_DIR}/CLI11/include
2321
)
2422

2523
if (MSVC)
@@ -35,6 +33,31 @@ endif()
3533
add_library (imported::External_libs INTERFACE IMPORTED)
3634
add_library(imported::External_editorLibs INTERFACE IMPORTED)
3735

36+
target_include_directories(imported::External_lib INTERFACE
37+
${EXTERNAL_DIR}/Vulkan-Headers/build/install/include
38+
${EXTERNAL_DIR}/fmt/include
39+
${EXTERNAL_DIR}/glm/glm
40+
${EXTERNAL_DIR}/imgui/src
41+
${EXTERNAL_DIR}/tlsf/src
42+
${EXTERNAL_DIR}/rapidhash/src
43+
${EXTERNAL_DIR}/spdlog/include
44+
${EXTERNAL_DIR}/glfw/include
45+
${EXTERNAL_DIR}/entt
46+
${EXTERNAL_DIR}/assimp/include
47+
${EXTERNAL_DIR}/stduuid/include
48+
${EXTERNAL_DIR}/yaml-cpp/include
49+
${EXTERNAL_DIR}/SPIRV-headers
50+
${EXTERNAL_DIR}/SPIRV-Tools
51+
${EXTERNAL_DIR}/glslang
52+
${EXTERNAL_DIR}/SPIRV-Cross
53+
${EXTERNAL_DIR}/VulkanMemoryAllocator
54+
)
55+
56+
target_include_directories(imported::External_editorLibs INTERFACE
57+
${EXTERNAL_DIR}/nlohmann_json/single_include
58+
${EXTERNAL_DIR}/CLI11/include
59+
)
60+
3861

3962
target_link_libraries(imported::External_editorLibs INTERFACE
4063
CLI11::CLI11

0 commit comments

Comments
 (0)