CMAKE: fixed missing shared object for anim module if e.g. voxedit was built directly

the dependency to the shared lib wasn't modelled properly
master
Martin Gerhardy 2021-10-27 21:13:05 +02:00
parent 21ce8023a5
commit 91b140ccb5
5 changed files with 23 additions and 8 deletions

View File

@ -165,6 +165,13 @@ find_package(Curses)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
set(HOT_RELOAD_ANIM 1)
else()
set(HOT_RELOAD_ANIM 0)
endif()
# These includes are needed to let the include for IMPLICIT_DEPENDS for shaders work
include_directories(src/modules/video/shaders)
include_directories(src/modules/compute/shaders)

View File

@ -1,11 +1,6 @@
set(LIB animation)
set(SRCS)
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
set(HOT_RELOAD_ANIM 1)
else()
set(HOT_RELOAD_ANIM 0)
endif()
# Maintain a list of animations to support hot reloading
set(SRCS_ANIMATIONS

View File

@ -17,4 +17,8 @@ set(FILES
)
set(LIB frontend)
engine_add_module(TARGET ${LIB} SRCS ${SRCS} FILES ${FILES} DEPENDENCIES attrib animation shared audio)
set(DEPENDENCIES attrib animation shared audio)
if (HOT_RELOAD_ANIM)
list(APPEND DEPENDENCIES anim)
endif()
engine_add_module(TARGET ${LIB} SRCS ${SRCS} FILES ${FILES} DEPENDENCIES ${DEPENDENCIES})

View File

@ -5,5 +5,9 @@ set(SRCS
set(FILES
testanimation/testanimation-keybindings.cfg
)
set(DEPENDENCIES testcore animation network)
if (HOT_RELOAD_ANIM)
list(APPEND DEPENDENCIES anim)
endif()
engine_add_executable(TARGET ${PROJECT_NAME} SRCS ${SRCS} FILES ${FILES} WINDOWED NOINSTALL)
engine_target_link_libraries(TARGET ${PROJECT_NAME} DEPENDENCIES testcore animation network)
engine_target_link_libraries(TARGET ${PROJECT_NAME} DEPENDENCIES ${DEPENDENCIES})

View File

@ -28,7 +28,12 @@ set(SRCS
tool/Resize.h tool/Resize.cpp
)
set(LIB voxedit-util)
engine_add_module(TARGET ${LIB} SRCS ${SRCS} DEPENDENCIES voxelrender voxelgenerator animation)
set(DEPENDENCIES voxelrender voxelgenerator animation)
if (HOT_RELOAD_ANIM)
list(APPEND DEPENDENCIES anim)
endif()
engine_add_module(TARGET ${LIB} SRCS ${SRCS} DEPENDENCIES ${DEPENDENCIES})
set(TEST_SRCS
tests/AnimationLuaSaverTest.cpp