diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 3763655..8c47476 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -13,9 +13,7 @@ file(GLOB_RECURSE GAME_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") add_executable(${GAME} ${GAME_SOURCES}) target_include_directories(${GAME} PRIVATE - "src" - "${CMAKE_SOURCE_DIR}/src" - "${CMAKE_SOURCE_DIR}/vendor/ruc/src") + "src") target_link_libraries(${GAME} ${ENGINE}) target_precompile_headers(${GAME} REUSE_FROM ${ENGINE}) @@ -25,5 +23,5 @@ target_precompile_headers(${GAME} REUSE_FROM ${ENGINE}) # Add 'make run' target add_custom_target(run COMMAND ${GAME} - WORKING_DIRECTORY ".." -) + WORKING_DIRECTORY "..") +add_dependencies(run ${ENGINE}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2e121df..730489a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,14 +1,12 @@ file(GLOB_RECURSE ENGINE_SOURCES "${ENGINE}/*.cpp") add_library(${ENGINE} ${ENGINE_SOURCES}) -target_include_directories(${ENGINE} PRIVATE +target_include_directories(${ENGINE} PUBLIC "." "../vendor/entt/src" - "../vendor/glad/include" "../vendor/glfw/include" "../vendor/glm" "../vendor/json/include" - "../vendor/lua" "../vendor/ruc/src" "../vendor/sol2/include" "../vendor/stb") diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt index a6bb551..4f9b926 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt @@ -18,7 +18,7 @@ list(REMOVE_ITEM LUA "${CMAKE_CURRENT_SOURCE_DIR}/lua/lua/lua.c") # Do not co set(ENGINE_SOURCES ${GLAD} ${LUA}) add_library(${ENGINE}-dependencies ${ENGINE_SOURCES}) -target_include_directories(${ENGINE}-dependencies PRIVATE +target_include_directories(${ENGINE}-dependencies PUBLIC "glad/include" "lua") target_link_libraries(${ENGINE}-dependencies glfw ruc)