From 4381a4d0a1eec22dfd16cd28591df0cfcbf81a9f Mon Sep 17 00:00:00 2001 From: skal Date: Wed, 28 Jan 2026 10:38:30 +0100 Subject: fix(build): Robust asset tool invocation using generator expressions Switched to using in to ensure CMake correctly resolves the tool path regardless of the build environment. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 9217864..1e4582b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ set(GENERATED_DEMO_ASSETS_DATA_CC ${CMAKE_CURRENT_BINARY_DIR}/src/assets_data.cc add_custom_command( OUTPUT ${GENERATED_DEMO_ASSETS_H} ${GENERATED_DEMO_ASSETS_DATA_CC} COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/src - COMMAND asset_packer ${DEMO_ASSETS_TXT_PATH} ${GENERATED_DEMO_ASSETS_H} ${GENERATED_DEMO_ASSETS_DATA_CC} + COMMAND $ ${DEMO_ASSETS_TXT_PATH} ${GENERATED_DEMO_ASSETS_H} ${GENERATED_DEMO_ASSETS_DATA_CC} DEPENDS asset_packer ${DEMO_ASSETS_TXT_PATH} COMMENT "Generating demo assets.h and assets_data.cc" ) @@ -91,7 +91,7 @@ set(GENERATED_TEST_ASSETS_DATA_CC ${CMAKE_CURRENT_BINARY_DIR}/src/test_assets_da add_custom_command( OUTPUT ${GENERATED_TEST_ASSETS_H} ${GENERATED_TEST_ASSETS_DATA_CC} COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/src - COMMAND asset_packer ${TEST_ASSETS_TXT_PATH} ${GENERATED_TEST_ASSETS_H} ${GENERATED_TEST_ASSETS_DATA_CC} + COMMAND $ ${TEST_ASSETS_TXT_PATH} ${GENERATED_TEST_ASSETS_H} ${GENERATED_TEST_ASSETS_DATA_CC} DEPENDS asset_packer ${TEST_ASSETS_TXT_PATH} COMMENT "Generating test assets.h and assets_data.cc" ) -- cgit v1.2.3