From c5972a55ad8b819b2acb9d02d6b8513ae4223c11 Mon Sep 17 00:00:00 2001 From: JackCarterSmith Date: Mon, 20 Feb 2023 22:25:18 +0100 Subject: [PATCH] CMakeFile update --- CMakeLists.txt | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0dca3b7..b5bb70d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # CMakeLists.txt #################################################### -# Written by JackCarterSmith, 2022 +# Written by JackCarterSmith, 2023 # This code is released under the RDI license. #################################################### @@ -43,9 +43,9 @@ option(RDI_STATIC "Build static lib" ON) option(BUILD_TOOLS "Build lib tools" ON) # Import needed packages and references their include path -find_package(RSPModel 2.3 REQUIRED) +find_package(RSPModel 2.3 REQUIRED EXACT) include_directories(${RSPModel_INCLUDE_DIR}) -find_package(RSPTerrain 2.0 REQUIRED) +find_package(RSPTerrain 2.1 REQUIRED EXACT) include_directories(${RSPTerrain_INCLUDE_DIR}) find_package(RSPTexture 2.1 REQUIRED) include_directories(${RSPTexture_INCLUDE_DIR}) @@ -212,16 +212,29 @@ if(BUILD_TOOLS) # Static libgcc and libstdc++ already linked in library if(RDI_SHARED) + add_dependencies(rdi-debug-tools rdi-lib) + add_dependencies(erso-debug-tools rdi-lib) + add_dependencies(krennic-debug-tools rdi-lib) target_link_libraries(rdi-debug-tools PRIVATE rdi-lib ${Boost_LIBRARIES}) - target_link_libraries(erso-debug-tools PRIVATE rdi-lib) - target_link_libraries(krennic-debug-tools PRIVATE rdi-lib) + target_link_libraries(erso-debug-tools PRIVATE rdi-lib ${Boost_LIBRARIES}) + target_link_libraries(krennic-debug-tools PRIVATE rdi-lib ${Boost_LIBRARIES}) elseif(RDI_STATIC) + add_dependencies(rdi-debug-tools rdi-libstatic) + add_dependencies(erso-debug-tools rdi-libstatic) + add_dependencies(krennic-debug-tools rdi-libstatic) target_link_libraries(rdi-debug-tools PRIVATE rdi-libstatic ${Boost_LIBRARIES}) - target_link_libraries(erso-debug-tools PRIVATE rdi-libstatic) - target_link_libraries(krennic-debug-tools PRIVATE rdi-libstatic) + target_link_libraries(erso-debug-tools PRIVATE rdi-libstatic ${Boost_LIBRARIES}) + target_link_libraries(krennic-debug-tools PRIVATE rdi-libstatic ${Boost_LIBRARIES}) endif() endif() +# Add special tool command +add_custom_target(blender-map-render + COMMENT "Using Blender script to generate map render" + COMMAND ${BLENDER_PATH}/blender -b -t 0 -P ${CMAKE_CURRENT_SOURCE_DIR}/tools/map_render.py -F JPEG -x 1 -o //objOut/lv_\#\# -f 1..20 + WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/bin +) + # GPG signature custom command #add_custom_command(