GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix issues when openvulkano is linked as library

Browse Source
This commit is contained in:
ohyzha
2024-09-23 15:59:23 +03:00
parent b7f640fe53
commit 69f07f09f9
6 changed files with 41 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/TryCompileShaders.cmake.in
View File

@@ -1,5 +1,5 @@
execute_process(COMMAND "@BASH_EXECUTABLE@" CompileShaders.sh "@SHADER_OUTPUT_DEST@"
WORKING_DIRECTORY "@ROOT_FOLDER@/Scripts"
execute_process(COMMAND "@BASH_EXECUTABLE@" CompileShaders.sh "@SHADER_OUTPUT_DEST@" "@SHADER_FILES_LOCATION@" "@UNIQUE_ENTRY_NAME@"
WORKING_DIRECTORY "@SCRIPT_FOLDER@"
RESULT_VARIABLE res_var)
if(NOT "${res_var}" STREQUAL "0")
message(FATAL_ERROR "Failed to recompile shaders")

11
cmake/functions/SetShaderDependency.cmake
View File

@@ -14,12 +14,13 @@ function(SetShaderDependency TARGET SHADER_SRC_FOLDER SHADER_OUTPUT_FOLDER)
endif()
endforeach()
set(SHADER_EXPECTED_OUTPUT ${OUTPUT_HEADERS} ${OUTPUT_SOURCES})
add_custom_command(OUTPUT ${SHADER_EXPECTED_OUTPUT}
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/TryCompileShaders.cmake
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/TryCompileShaders.cmake
DEPENDS ${SHADER_SRC_FILES}
COMMENT "Recompiling shaders")
add_custom_target(RecompileShaders ALL
COMMENT "Recompiling shaders"
VERBATIM)
add_custom_target("RecompileShaders_${TARGET}" ALL
DEPENDS ${SHADER_EXPECTED_OUTPUT})
add_dependencies(${TARGET} RecompileShaders)
add_dependencies(${TARGET} "RecompileShaders_${TARGET}")
endfunction(SetShaderDependency)