Add devue_plugin_core as dep

dvsku · Feb 11, 2024 · 06d6c3d · 06d6c3d
1 parent 2cf8344
commit 06d6c3d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
@@ -6,9 +6,19 @@ SET(FETCHCONTENT_UPDATES_DISCONNECTED ON)
 FetchContent_Declare(
 	dv_gui_opengl
 	GIT_REPOSITORY https://github.com/dvsku/dv_gui_opengl.git
-	IT_TAG master
+	GIT_TAG master
 )
 
 FetchContent_MakeAvailable(dv_gui_opengl)
 
-SET(DV_GUI_INCLUDES "${dv_gui_opengl_SOURCE_DIR}/include" PARENT_SCOPE)
+SET(DV_GUI_INCLUDES "${dv_gui_opengl_SOURCE_DIR}/include" PARENT_SCOPE)
+
+FetchContent_Declare(
+	devue_plugin_core
+	GIT_REPOSITORY https://github.com/dvsku/devue_plugin_core.git
+	GIT_TAG master
+)
+
+FetchContent_MakeAvailable(devue_plugin_core)
+
+SET(DEVUE_PLUGIN_CORE_INCLUDES "${devue_plugin_core_SOURCE_DIR}/include" PARENT_SCOPE)
diff --git a/src/devue_app/CMakeLists.txt b/src/devue_app/CMakeLists.txt
@@ -28,10 +28,10 @@ ADD_EXECUTABLE(devue
 TARGET_LINK_OPTIONS(devue PRIVATE "/SUBSYSTEM:WINDOWS")
 
 TARGET_INCLUDE_DIRECTORIES(devue PRIVATE "${DV_GUI_INCLUDES}")
+TARGET_INCLUDE_DIRECTORIES(devue PRIVATE "${DEVUE_PLUGIN_CORE_INCLUDES}")
 TARGET_INCLUDE_DIRECTORIES(devue PRIVATE "${DEVUE_LIB_DIR}/glm/include")
 
 TARGET_INCLUDE_DIRECTORIES(devue PRIVATE "${DEVUE_INCLUDE_DIR}/devue_core")
-TARGET_INCLUDE_DIRECTORIES(devue PRIVATE "${DEVUE_LIB_DIR}/plugin_core/include")
 TARGET_INCLUDE_DIRECTORIES(devue PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src")
 
 TARGET_LINK_LIBRARIES(devue dv_gui_opengl)

diff --git a/src/devue_core/CMakeLists.txt b/src/devue_core/CMakeLists.txt
@@ -41,8 +41,8 @@ ADD_CUSTOM_TARGET(copy_resources ALL
 ADD_DEPENDENCIES(copy_resources devue_core)
 
 TARGET_INCLUDE_DIRECTORIES(devue_core PRIVATE "${DV_GUI_INCLUDES}")
+TARGET_INCLUDE_DIRECTORIES(devue_core PRIVATE "${DEVUE_PLUGIN_CORE_INCLUDES}")
 TARGET_INCLUDE_DIRECTORIES(devue_core PRIVATE "${DEVUE_LIB_DIR}/glm/include")
 TARGET_INCLUDE_DIRECTORIES(devue_core PRIVATE "${DEVUE_LIB_DIR}")
 
 TARGET_INCLUDE_DIRECTORIES(devue_core PRIVATE "${DEVUE_INCLUDE_DIR}/devue_core")
-TARGET_INCLUDE_DIRECTORIES(devue_core PRIVATE "${DEVUE_LIB_DIR}/plugin_core/include")