From a228dc2e470cc2e2148e8bcb6c830321ff7233cf Mon Sep 17 00:00:00 2001
From: ohyzha <oleksii.hyzha.ext@madvoxel.com>
Date: Thu, 11 Jul 2024 14:33:50 +0300
Subject: [PATCH] fail cmake build on shader compilation failure

---
 CMakeLists.txt                | 13 +++++++++----
 Scripts/CompileShaders.sh     |  6 +-----
 cmake/TryCompileShaders.cmake |  4 ++++
 3 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 cmake/TryCompileShaders.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7dd813..a909cdd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,21 +81,26 @@ endif ()
 SetupVulkan(openVulkanoCpp)
 
 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)
 foreach(VERT_FILE ${SHADER_VERT_FILES})
     get_filename_component(FILENAME ${VERT_FILE} NAME)
     string(REGEX REPLACE "[.]vert" ".c" OUTPUT_C ${FILENAME})
     string(REGEX REPLACE "[.]vert" ".h" OUTPUT_H ${FILENAME})
-    list(APPEND OUTPUT_HEADERS ${CMAKE_SOURCE_DIR}/openVulkanoCpp/GeneratedShaderData/${OUTPUT_H})
-    list(APPEND OUTPUT_SOURCES ${CMAKE_SOURCE_DIR}/openVulkanoCpp/GeneratedShaderData/${OUTPUT_C})
+    list(APPEND OUTPUT_HEADERS ${SHADER_OUTPUT_FOLDER}/${OUTPUT_H})
+    list(APPEND OUTPUT_SOURCES ${SHADER_OUTPUT_FOLDER}/${OUTPUT_C})
 endforeach()
 file(GLOB SHADER_FRAG_FILES ${SHADER_SRC_FOLDER}/*.frag)
 set(SHADER_SRC_FILES ${SHADER_VERT_FILES} ${SHADER_FRAG_FILES})
 set(SHADER_EXPECTED_OUTPUT ${OUTPUT_HEADERS} ${OUTPUT_SOURCES})
 
 add_custom_command(OUTPUT ${SHADER_EXPECTED_OUTPUT}
-                    COMMAND ${CMAKE_SOURCE_DIR}/Scripts/CompileShaders.sh
-                    COMMAND ${CMAKE_SOURCE_DIR}/Scripts/checkme.sh
+                    COMMAND ${CMAKE_COMMAND} -DROOT_FOLDER=${CMAKE_SOURCE_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/TryCompileShaders.cmake
                     DEPENDS ${SHADER_SRC_FILES}
                     COMMENT "Recompiling shaders")
 add_custom_target(RecompileShaders ALL
diff --git a/Scripts/CompileShaders.sh b/Scripts/CompileShaders.sh
index 90db9d6..e469dee 100644
--- a/Scripts/CompileShaders.sh
+++ b/Scripts/CompileShaders.sh
@@ -7,12 +7,11 @@ check_return_code() {
   # return code of last executed command  
   retVal=$?
   if [ $retVal -ne 0 ]; then
-    read -p "Press enter to continue"
     exit 1
   fi
 }
 
-rm *.spv
+rm -f *.spv
 
 for f in $SHADER_PATH/*.vert ; do
   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
   rm *.spv
 done
-
-read -p "Press enter to continue"
-
diff --git a/cmake/TryCompileShaders.cmake b/cmake/TryCompileShaders.cmake
new file mode 100644
index 0000000..20f103b
--- /dev/null
+++ b/cmake/TryCompileShaders.cmake
@@ -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()