Skip to content

Commit 0783fa8

Browse files
committed
cmake: use the conditional file generation helper to generate shaders.cpp
1 parent e02d314 commit 0783fa8

2 files changed

Lines changed: 13 additions & 7 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,7 @@ function(AddApplication)
903903
set_property(TARGET ${A_Target}-objects APPEND PROPERTY COMPILE_OPTIONS ${A_Flags})
904904
set_property(TARGET ${A_Target}-objects APPEND PROPERTY INCLUDE_DIRECTORIES ${ENGINE_DIR} ${MOUNT_DIR} ${LIB_DIR})
905905
set_property(TARGET ${A_Target}-objects APPEND PROPERTY COMPILE_DEFINITIONS ${A_Definitions})
906-
906+
907907
set_target_properties(${A_Target}-objects PROPERTIES FOLDER "engine/objects")
908908

909909
set(Sources WIN32 ${A_ApplicationMain})
@@ -973,25 +973,31 @@ if (BUILD_CLIENT)
973973
set(SHADERS_CPP_TEXT "// This file is auto-generated by CMakeLists.txt.\n")
974974
string(APPEND SHADERS_CPP_TEXT "#include \"common/Common.h\"\n\n")
975975
set(SHADERMAP_TEXT "")
976+
976977
foreach(res ${GLSLSOURCELIST})
977978
get_filename_component(filename_no_ext ${res} NAME_WE)
978979
set(outpath ${EMBED_INCLUDE_DIR}/${filename_no_ext}.glsl.h)
980+
979981
add_custom_command(
980982
OUTPUT ${outpath}
981983
COMMAND ${CMAKE_COMMAND} "-DINPUT_FILE=${res}" "-DOUTPUT_FILE=${outpath}"
982984
"-DVARIABLE_NAME=${filename_no_ext}_glsl" -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/EmbedText.cmake
983985
MAIN_DEPENDENCY ${res}
984986
)
987+
985988
set_property(TARGET client-objects APPEND PROPERTY SOURCES ${outpath})
986-
string(APPEND SHADERS_CPP_TEXT "#include \"../embed_data/${filename_no_ext}.glsl.h\"\n")
987-
string(APPEND SHADERMAP_TEXT "\t{ \"${filename_no_ext}.glsl\", ")
988-
string(APPEND SHADERMAP_TEXT "std::string(reinterpret_cast<const char *>( ${filename_no_ext}_glsl ), ")
989-
string(APPEND SHADERMAP_TEXT "sizeof( ${filename_no_ext}_glsl )) },\n")
989+
990+
string(APPEND SHADERS_CPP_TEXT "#include \"../embed_data/${filename_no_ext}.glsl.h\"\n")
991+
string(APPEND SHADERMAP_TEXT "\t{ \"${filename_no_ext}.glsl\", ")
992+
string(APPEND SHADERMAP_TEXT "std::string(reinterpret_cast<const char *>( ${filename_no_ext}_glsl ), ")
993+
string(APPEND SHADERMAP_TEXT "sizeof( ${filename_no_ext}_glsl )) },\n")
990994
endforeach()
995+
991996
string(APPEND SHADERS_CPP_TEXT "\nextern const std::unordered_map<std::string, std::string> shadermap\n{\n")
992997
string(APPEND SHADERS_CPP_TEXT "${SHADERMAP_TEXT}")
993998
string(APPEND SHADERS_CPP_TEXT "};\n")
994-
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/GeneratedSource/shaders.cpp" "${SHADERS_CPP_TEXT}")
999+
1000+
daemon_write_generated("shaders.cpp" "${SHADERS_CPP_TEXT}")
9951001
endif()
9961002

9971003
if (BUILD_SERVER)

‎src.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ set(COMMONTESTLIST
8080
)
8181

8282
set(RENDERERLIST
83-
${CMAKE_CURRENT_BINARY_DIR}/GeneratedSource/shaders.cpp
83+
${DAEMON_GENERATED_DIR}/shaders.cpp
8484
${ENGINE_DIR}/renderer/BufferBind.h
8585
${ENGINE_DIR}/renderer/DetectGLVendors.cpp
8686
${ENGINE_DIR}/renderer/DetectGLVendors.h

0 commit comments

Comments
 (0)