CMake+Meta: Add inferno dependency, which includes ruc indirectly

This commit is contained in:
Riyyi
2022-10-16 12:46:10 +02:00
parent 136250355e
commit 5919f70537
5 changed files with 20 additions and 15 deletions
+3 -3
View File
@@ -1,3 +1,3 @@
[submodule "vendor/ruc"] [submodule "vendor/inferno"]
path = vendor/ruc path = vendor/inferno
url = https://github.com/riyyi/ruc url = https://github.com/riyyi/inferno
+15 -11
View File
@@ -52,21 +52,28 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
# ------------------------------------------ # ------------------------------------------
# Library # Library
set(RUC_BUILD_TESTS OFF) set(INFERNO_BUILD_EXAMPLES OFF)
add_subdirectory("vendor/ruc") add_subdirectory("vendor/inferno")
# ------------------------------------------ # ------------------------------------------
# Application target # Application target
# Define source files # Define source files
file(GLOB_RECURSE PROJECT_SOURCES "src/*.cpp") file(GLOB_RECURSE PROJECT_SOURCES "src/*.cpp")
set(PROJECT_SOURCES ${PROJECT_SOURCES})
add_executable(${PROJECT} ${PROJECT_SOURCES}) add_executable(${PROJECT} ${PROJECT_SOURCES})
target_include_directories(${PROJECT} PRIVATE target_include_directories(${PROJECT} PRIVATE
"src" "src")
"vendor/ruc/src") target_link_libraries(${PROJECT} inferno)
target_link_libraries(${PROJECT} ruc)
# ------------------------------------------
# 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 # Execute target
@@ -87,9 +94,6 @@ if (GARBAGE_BUILD_TESTS)
add_executable(${PROJECT}-unit-test ${TEST_SOURCES}) add_executable(${PROJECT}-unit-test ${TEST_SOURCES})
target_include_directories(${PROJECT}-unit-test PRIVATE target_include_directories(${PROJECT}-unit-test PRIVATE
"src" "src"
"test" "test")
"vendor/ruc/src" target_link_libraries(${PROJECT}-unit-test inferno)
"vendor/ruc/test")
target_link_libraries(${PROJECT}-unit-test ruc)
target_link_libraries(${PROJECT}-unit-test ruc-test)
endif() endif()
+1
View File
@@ -0,0 +1 @@
file(COPY ${CMAKE_CURRENT_LIST_DIR}/../assets DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
Vendored Submodule
+1
Submodule vendor/inferno added at f47babe5cf
Vendored
-1
Submodule vendor/ruc deleted from d3de1fb635