From 5919f7053745db7f6694cad037db60cd94749c14 Mon Sep 17 00:00:00 2001 From: Riyyi Date: Mon, 26 Sep 2022 22:54:37 +0200 Subject: [PATCH] CMake+Meta: Add inferno dependency, which includes ruc indirectly --- .gitmodules | 6 +++--- CMakeLists.txt | 26 +++++++++++++++----------- cmake/copy-assets.cmake | 1 + vendor/inferno | 1 + vendor/ruc | 1 - 5 files changed, 20 insertions(+), 15 deletions(-) create mode 100644 cmake/copy-assets.cmake create mode 160000 vendor/inferno delete mode 160000 vendor/ruc diff --git a/.gitmodules b/.gitmodules index ecf6858..454ae02 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "vendor/ruc"] - path = vendor/ruc - url = https://github.com/riyyi/ruc +[submodule "vendor/inferno"] + path = vendor/inferno + url = https://github.com/riyyi/inferno diff --git a/CMakeLists.txt b/CMakeLists.txt index bf36065..3cd280b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,21 +52,28 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # ------------------------------------------ # Library -set(RUC_BUILD_TESTS OFF) -add_subdirectory("vendor/ruc") +set(INFERNO_BUILD_EXAMPLES OFF) +add_subdirectory("vendor/inferno") # ------------------------------------------ # Application target # Define source files file(GLOB_RECURSE PROJECT_SOURCES "src/*.cpp") -set(PROJECT_SOURCES ${PROJECT_SOURCES}) add_executable(${PROJECT} ${PROJECT_SOURCES}) target_include_directories(${PROJECT} PRIVATE - "src" - "vendor/ruc/src") -target_link_libraries(${PROJECT} ruc) + "src") +target_link_libraries(${PROJECT} inferno) + +# ------------------------------------------ +# Assets target + +add_custom_target(${PROJECT}-assets + COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/copy-assets.cmake + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) +add_dependencies(${PROJECT} ${PROJECT}-assets) +add_dependencies(${PROJECT}-assets inferno-assets) # Copy project assets *AFTER* engine assets! # ------------------------------------------ # Execute target @@ -87,9 +94,6 @@ if (GARBAGE_BUILD_TESTS) add_executable(${PROJECT}-unit-test ${TEST_SOURCES}) target_include_directories(${PROJECT}-unit-test PRIVATE "src" - "test" - "vendor/ruc/src" - "vendor/ruc/test") - target_link_libraries(${PROJECT}-unit-test ruc) - target_link_libraries(${PROJECT}-unit-test ruc-test) + "test") + target_link_libraries(${PROJECT}-unit-test inferno) endif() diff --git a/cmake/copy-assets.cmake b/cmake/copy-assets.cmake new file mode 100644 index 0000000..5fb4890 --- /dev/null +++ b/cmake/copy-assets.cmake @@ -0,0 +1 @@ +file(COPY ${CMAKE_CURRENT_LIST_DIR}/../assets DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/vendor/inferno b/vendor/inferno new file mode 160000 index 0000000..f47babe --- /dev/null +++ b/vendor/inferno @@ -0,0 +1 @@ +Subproject commit f47babe5cfcdb3137c97bd197f167a2b8280024f diff --git a/vendor/ruc b/vendor/ruc deleted file mode 160000 index d3de1fb..0000000 --- a/vendor/ruc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d3de1fb6353c81e6796515e631a73d3ec607ce3f