Commit 6a0697cc authored by Lotrado's avatar Lotrado
Browse files

Don't include SOURCES in DEPENDS in mirrage_embed_asset to avoid dependencies...

Don't include SOURCES in DEPENDS in mirrage_embed_asset to avoid dependencies on directories instead of files.
parent 275b18bb
...@@ -23,7 +23,7 @@ macro(mirrage_embed_asset) ...@@ -23,7 +23,7 @@ macro(mirrage_embed_asset)
add_custom_command(OUTPUT ${EMBED_SRC_FILE} add_custom_command(OUTPUT ${EMBED_SRC_FILE}
COMMAND ${CMAKE_COMMAND} -DMIRRAGE_ROOT_DIR=${MIRRAGE_ROOT_DIR} -DEMBED_MODE=${EMBED_MODE} -DID=${ID} -DSRC_FILES=${src_files_str} -DDST_DIR=${CMAKE_CURRENT_BINARY_DIR} -DEMBED_SRC_FILE=${EMBED_SRC_FILE} -P ${MIRRAGE_ROOT_DIR}/embed_recursive_into_asm.cmake COMMAND ${CMAKE_COMMAND} -DMIRRAGE_ROOT_DIR=${MIRRAGE_ROOT_DIR} -DEMBED_MODE=${EMBED_MODE} -DID=${ID} -DSRC_FILES=${src_files_str} -DDST_DIR=${CMAKE_CURRENT_BINARY_DIR} -DEMBED_SRC_FILE=${EMBED_SRC_FILE} -P ${MIRRAGE_ROOT_DIR}/embed_recursive_into_asm.cmake
DEPENDS ${EMBED_ASSET_SOURCES} ${EMBED_ASSET_DEPENDS} DEPENDS ${EMBED_ASSET_DEPENDS}
VERBATIM VERBATIM
) )
......
...@@ -32,7 +32,10 @@ cfg:gui = settings/gui.json ...@@ -32,7 +32,10 @@ cfg:gui = settings/gui.json
loc: = loc/ loc: = loc/
pl_cache: = pipeline_caches pl_cache: = pipeline_caches
") ")
mirrage_embed_asset(TARGET mirrage EXPORT mirrage_targets SOURCES "${CMAKE_CURRENT_BINARY_DIR}/assets_mirrage_core.map") mirrage_embed_asset(TARGET mirrage
EXPORT mirrage_targets
SOURCES "${CMAKE_CURRENT_BINARY_DIR}/assets_mirrage_core.map"
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/assets_mirrage_core.map")
set(MIRRAGE_DEFAULT_COMPILER_ARGS ${MIRRAGE_DEFAULT_COMPILER_ARGS}) set(MIRRAGE_DEFAULT_COMPILER_ARGS ${MIRRAGE_DEFAULT_COMPILER_ARGS})
target_compile_options(mirrage PRIVATE ${MIRRAGE_DEFAULT_COMPILER_ARGS}) target_compile_options(mirrage PRIVATE ${MIRRAGE_DEFAULT_COMPILER_ARGS})
......
...@@ -83,7 +83,9 @@ mirrage_embed_asset(TARGET mirrage_renderer ...@@ -83,7 +83,9 @@ mirrage_embed_asset(TARGET mirrage_renderer
"${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_mirrage_renderer_shader.map" "${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_mirrage_renderer_shader.map"
"${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_mirrage_renderer_textures.map" "${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_mirrage_renderer_textures.map"
DEPENDS DEPENDS
${SPIRV_BINARY_FILES}) ${SPIRV_BINARY_FILES}
"${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_mirrage_renderer_shader.map"
"${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_mirrage_renderer_textures.map")
option(MIRRAGE_HISTOGRAM_DEBUG_VIEW "Enable debug view for tone mapping pass" OFF) option(MIRRAGE_HISTOGRAM_DEBUG_VIEW "Enable debug view for tone mapping pass" OFF)
if(MIRRAGE_HISTOGRAM_DEBUG_VIEW) if(MIRRAGE_HISTOGRAM_DEBUG_VIEW)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment