From 591c473dda71c51c5e2a96e8f2a70a9e296a4444 Mon Sep 17 00:00:00 2001 From: 0scar Date: Fri, 1 Mar 2024 08:28:01 +0100 Subject: Fixup stb dependency again --- CMakeLists.txt | 1 + src/CMakeLists.txt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 65ed5da..658d360 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -105,6 +105,7 @@ FetchContent_Declare(stb FetchContent_MakeAvailable(cglm stb) ## Glad +# TODO: make sure the glad command is run before building set(GLAD_HEADER ${CMAKE_BINARY_DIR}/include/glad/gl.h) ## Compilation information diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4fd2654..be1d2d9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -25,6 +25,8 @@ set_property(TARGET ${PROJECT_NAME} PROPERTY C_STANDARD 99) target_include_directories(${PROJECT_NAME} PUBLIC include + # TODO make including stb more streamlined + ${CMAKE_BINARY_DIR}/_deps/cgs-src/src ${CMAKE_BINARY_DIR}/include ${ENGINE_INCLUDE}) @@ -32,7 +34,6 @@ target_link_libraries(${PROJECT_NAME} glfw OpenGL::GL cglm - stb daw_core daw_rendering daw_ctrl -- cgit v1.3