Make shader resource file generation reusable

Author: kblaschke

cmake/GenerateShaderResources.cmake

@@ -0,0 +1,20 @@
+macro(GENERATE_SHADER_RESOURCES _output_file)
+    string(REPLACE ";" "\\;" SHADER_FILES_ARG "${ARGN}")
+    add_custom_command(OUTPUT
+            "${_output_file}"
+
+            COMMAND ${CMAKE_COMMAND}
+
+            ARGS
+            -D "SHADER_FILES=${SHADER_FILES_ARG}"
+            -D "OUTPUT_FILE=${_output_file}"
+            -P "${PROJECTM_SOURCE_DIR}/cmake/GenerateShaderResourcesScript.cmake"
+
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+            DEPENDS # Watch scripts and shader files for changes
+            ${PROJECTM_SOURCE_DIR}/cmake/ShaderResources.hpp.in
+            ${PROJECTM_SOURCE_DIR}/cmake/GenerateShaderResources.cmake
+            ${PROJECTM_SOURCE_DIR}/cmake/GenerateShaderResourcesScript.cmake
+            ${ARGN}
+            )
+endmacro()

src/libprojectM/Renderer/GenerateBuiltInTransitionsResources.cmake renamed to cmake/GenerateShaderResourcesScript.cmake

@@ -1,9 +1,14 @@
-cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 
 # Run as custom command in script mode if any shader file has changed.
 # Recreates the BuiltInTransitionsResources.hpp file accordingly.
 
 set(STATIC_SHADER_CONTENTS "")
+
+# Windows fix: the backslash is needed to escape the list in the script argument on UNIX shells,
+# but Windows keeps it and passes it on to CMake, breaking its use as a list separator.
+string(REPLACE "\\;" ";" SHADER_FILES "${SHADER_FILES}")
+
 foreach(shader_file IN LISTS SHADER_FILES)
     cmake_path(GET shader_file FILENAME _shader_name)
     cmake_path(GET shader_file EXTENSION _shader_type)
@@ -16,4 +21,4 @@ foreach(shader_file IN LISTS SHADER_FILES)
 
 endforeach()
 
-configure_file(BuiltInTransitionsResources.hpp.in ${OUTPUT_DIR}/BuiltInTransitionsResources.hpp @ONLY)
+configure_file(${CMAKE_CURRENT_LIST_DIR}/ShaderResources.hpp.in "${OUTPUT_FILE}" @ONLY)

src/libprojectM/Renderer/BuiltInTransitionsResources.hpp.in renamed to cmake/ShaderResources.hpp.in

@@ -10,27 +10,13 @@ set(TRANSITION_SHADER_FILES
         TransitionShaders/TransitionShaderMainGlsl330.frag
         )
 
-string(REPLACE ";" "\\;" TRANSITION_SHADER_FILES_ARG "${TRANSITION_SHADER_FILES}")
-add_custom_command(OUTPUT
-        ${CMAKE_CURRENT_BINARY_DIR}/BuiltInTransitionsResources.hpp
-
-        COMMAND ${CMAKE_COMMAND}
-
-        ARGS
-        -D SHADER_FILES="${TRANSITION_SHADER_FILES_ARG}"
-        -D OUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR}
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/GenerateBuiltInTransitionsResources.cmake
-
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        DEPENDS # Files watched for changes:
+include(GenerateShaderResources)
+generate_shader_resources(${CMAKE_CURRENT_BINARY_DIR}/BuiltInTransitionsResources.hpp
         ${TRANSITION_SHADER_FILES}
-        BuiltInTransitionsResources.hpp.in
-        GenerateBuiltInTransitionsResources.cmake
         )
 
 add_library(Renderer OBJECT
         ${CMAKE_CURRENT_BINARY_DIR}/BuiltInTransitionsResources.hpp
-        BuiltInTransitionsResources.hpp.in
         CopyTexture.cpp
         CopyTexture.hpp
         FileScanner.cpp