diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/DemoCodegen.cmake | 8 | ||||
| -rw-r--r-- | cmake/DemoLibraries.cmake | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/cmake/DemoCodegen.cmake b/cmake/DemoCodegen.cmake index 1e0badf..aa20a92 100644 --- a/cmake/DemoCodegen.cmake +++ b/cmake/DemoCodegen.cmake @@ -122,15 +122,17 @@ endfunction() # Timeline compilation set(DEMO_SEQ_PATH ${WORKSPACE_TIMELINE}) set(GENERATED_TIMELINE_CC ${CMAKE_CURRENT_SOURCE_DIR}/src/generated/timeline.cc) +set(GENERATED_TIMELINE_H ${CMAKE_CURRENT_SOURCE_DIR}/src/generated/timeline.h) +set(GENERATED_CODE ${GENERATED_TIMELINE_CC} ${GENERATED_TIMELINE_H}) add_custom_command( - OUTPUT ${GENERATED_TIMELINE_CC} + OUTPUT ${GENERATED_CODE} COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_SOURCE_DIR}/src/generated COMMAND ${SEQ_COMPILER_CMD} ${DEMO_SEQ_PATH} --output ${GENERATED_TIMELINE_CC} DEPENDS ${SEQ_COMPILER_DEPENDS} ${DEMO_SEQ_PATH} src/gpu/demo_effects.h COMMENT "Compiling demo sequence from workspace ${DEMO_WORKSPACE}..." ) -add_custom_target(generate_timeline ALL DEPENDS ${GENERATED_TIMELINE_CC}) +add_custom_target(generate_timeline ALL DEPENDS ${GENERATED_CODE}) # Music compilation set(TRACKER_MUSIC_PATH ${WORKSPACE_MUSIC}) @@ -255,5 +257,5 @@ pack_test_assets(test_assets ${CMAKE_CURRENT_SOURCE_DIR}/workspaces/test/assets. # Mark generated files so CMake always checks if they need rebuilding set_source_files_properties(${GEN_DEMO_H} ${GEN_DEMO_CC} PROPERTIES GENERATED TRUE) set_source_files_properties(${GEN_TEST_H} ${GEN_TEST_CC} PROPERTIES GENERATED TRUE) -set_source_files_properties(${GENERATED_TIMELINE_CC} PROPERTIES GENERATED TRUE) +set_source_files_properties(${GENERATED_CODE} PROPERTIES GENERATED TRUE) set_source_files_properties(${GENERATED_MUSIC_DATA_CC} PROPERTIES GENERATED TRUE) diff --git a/cmake/DemoLibraries.cmake b/cmake/DemoLibraries.cmake index f1891fb..39cd3f4 100644 --- a/cmake/DemoLibraries.cmake +++ b/cmake/DemoLibraries.cmake @@ -21,9 +21,9 @@ target_include_directories(3d PUBLIC ${CORE_INCLUDES}) add_dependencies(3d generate_demo_assets) # GPU effects library -add_library(gpu STATIC ${GPU_SOURCES}) +add_library(gpu STATIC ${GPU_SOURCES} ${GENERATED_TIMELINE_CC}) target_include_directories(gpu PUBLIC ${CORE_INCLUDES}) -add_dependencies(gpu generate_demo_assets) +add_dependencies(gpu generate_demo_assets generate_timeline) # Note: Static libraries do not strictly need to link dependencies, # but if they did, PRIVATE would propagate to the executable. |