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

fail cmake build on shader compilation failure

Browse Source
This commit is contained in:
ohyzha
2024-07-11 14:33:50 +03:00
parent a6caaeadf9
commit a228dc2e47
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@@ -81,21 +81,26 @@ endif ()
SetupVulkan(openVulkanoCpp) SetupVulkan(openVulkanoCpp)
set(SHADER_SRC_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/openVulkanoCpp/Shader) set(SHADER_SRC_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/openVulkanoCpp/Shader)
set(SHADER_OUTPUT_FOLDER ${CMAKE_SOURCE_DIR}/openVulkanoCpp/GeneratedShaderData)
if (NOT EXISTS ${SHADER_OUTPUT_FOLDER})
file(MAKE_DIRECTORY ${SHADER_OUTPUT_FOLDER})
endif ()
file(GLOB SHADER_VERT_FILES ${SHADER_SRC_FOLDER}/*.vert) file(GLOB SHADER_VERT_FILES ${SHADER_SRC_FOLDER}/*.vert)
foreach(VERT_FILE ${SHADER_VERT_FILES}) foreach(VERT_FILE ${SHADER_VERT_FILES})
get_filename_component(FILENAME ${VERT_FILE} NAME) get_filename_component(FILENAME ${VERT_FILE} NAME)
string(REGEX REPLACE "[.]vert" ".c" OUTPUT_C ${FILENAME}) string(REGEX REPLACE "[.]vert" ".c" OUTPUT_C ${FILENAME})
string(REGEX REPLACE "[.]vert" ".h" OUTPUT_H ${FILENAME}) string(REGEX REPLACE "[.]vert" ".h" OUTPUT_H ${FILENAME})
list(APPEND OUTPUT_HEADERS ${CMAKE_SOURCE_DIR}/openVulkanoCpp/GeneratedShaderData/${OUTPUT_H}) list(APPEND OUTPUT_HEADERS ${SHADER_OUTPUT_FOLDER}/${OUTPUT_H})
list(APPEND OUTPUT_SOURCES ${CMAKE_SOURCE_DIR}/openVulkanoCpp/GeneratedShaderData/${OUTPUT_C}) list(APPEND OUTPUT_SOURCES ${SHADER_OUTPUT_FOLDER}/${OUTPUT_C})
endforeach() endforeach()
file(GLOB SHADER_FRAG_FILES ${SHADER_SRC_FOLDER}/*.frag) file(GLOB SHADER_FRAG_FILES ${SHADER_SRC_FOLDER}/*.frag)
set(SHADER_SRC_FILES ${SHADER_VERT_FILES} ${SHADER_FRAG_FILES}) set(SHADER_SRC_FILES ${SHADER_VERT_FILES} ${SHADER_FRAG_FILES})
set(SHADER_EXPECTED_OUTPUT ${OUTPUT_HEADERS} ${OUTPUT_SOURCES}) set(SHADER_EXPECTED_OUTPUT ${OUTPUT_HEADERS} ${OUTPUT_SOURCES})
add_custom_command(OUTPUT ${SHADER_EXPECTED_OUTPUT} add_custom_command(OUTPUT ${SHADER_EXPECTED_OUTPUT}
COMMAND ${CMAKE_SOURCE_DIR}/Scripts/CompileShaders.sh COMMAND ${CMAKE_COMMAND} -DROOT_FOLDER=${CMAKE_SOURCE_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/TryCompileShaders.cmake
COMMAND ${CMAKE_SOURCE_DIR}/Scripts/checkme.sh
DEPENDS ${SHADER_SRC_FILES} DEPENDS ${SHADER_SRC_FILES}
COMMENT "Recompiling shaders") COMMENT "Recompiling shaders")
add_custom_target(RecompileShaders ALL add_custom_target(RecompileShaders ALL

6
Scripts/CompileShaders.sh
View File

@@ -7,12 +7,11 @@ check_return_code() {
# return code of last executed command # return code of last executed command
retVal=$? retVal=$?
if [ $retVal -ne 0 ]; then if [ $retVal -ne 0 ]; then
read -p "Press enter to continue"
exit 1 exit 1
fi fi
} }
rm *.spv rm -f *.spv
for f in $SHADER_PATH/*.vert ; do for f in $SHADER_PATH/*.vert ; do
filename=$(basename -- "$f") filename=$(basename -- "$f")
@@ -34,6 +33,3 @@ for f in $SHADER_PATH/*.vert ; do
sed -i "s/} TFileTableEntry;/} TFileTableEntry;\n#endif \/*TFileTableEntry_H_INCLUDED*\//" $GENERATED_DATA_PATH/$filename_no_ext.h sed -i "s/} TFileTableEntry;/} TFileTableEntry;\n#endif \/*TFileTableEntry_H_INCLUDED*\//" $GENERATED_DATA_PATH/$filename_no_ext.h
rm *.spv rm *.spv
done done
read -p "Press enter to continue"

4
cmake/TryCompileShaders.cmake Normal file
View File

@@ -0,0 +1,4 @@
execute_process(COMMAND bash -c "${ROOT_FOLDER}/Scripts/CompileShaders.sh" RESULT_VARIABLE res_var)
if(NOT "${res_var}" STREQUAL "0")
message(FATAL_ERROR "Failed to recompile shaders")
endif()