Comment out redundant Shaders source groups in main CMakeLists, already handled inside Shaders target

This commit is contained in:
Stephen Saunders 2023-01-12 15:31:18 -05:00
parent 2d1945044a
commit 245d06c4d6

View file

@ -502,17 +502,18 @@ file(GLOB RENDERER_VULKAN_SOURCES renderer/Vulkan/*.cpp)
file(GLOB RENDERER_NVRHI_INCLUDES renderer/NVRHI/*.h)
file(GLOB RENDERER_NVRHI_SOURCES renderer/NVRHI/*.cpp)
file(GLOB SHADERS shaders/*.hlsl shaders/*.inc )
file(GLOB SHADERS_BUILTIN shaders/builtin/*.hlsl )
file(GLOB SHADERS_BUILTIN_DEBUG shaders/builtin/debug/*.hlsl )
file(GLOB SHADERS_BUILTIN_FOG shaders/builtin/fog/*.hlsl )
file(GLOB SHADERS_BUILTIN_LEGACY shaders/builtin/legacy/*.hlsl )
file(GLOB SHADERS_BUILTIN_LIGHTING shaders/builtin/lighting/*.hlsl )
file(GLOB SHADERS_BUILTIN_POST shaders/builtin/post/*.hlsl )
file(GLOB SHADERS_BUILTIN_SSAO shaders/builtin/SSAO/*.hlsl )
file(GLOB SHADERS_BUILTIN_SSGI shaders/builtin/SSGI/*.hlsl )
file(GLOB SHADERS_BUILTIN_VIDEO shaders/builtin/video/*.hlsl )
file(GLOB SHADERS_BUILTIN_VR shaders/builtin/VR/*.hlsl )
# SRS - not needed, since handled by CMakeLists.txt for Shaders target
#file(GLOB SHADERS shaders/*.hlsl shaders/*.inc )
#file(GLOB SHADERS_BUILTIN shaders/builtin/*.hlsl )
#file(GLOB SHADERS_BUILTIN_DEBUG shaders/builtin/debug/*.hlsl )
#file(GLOB SHADERS_BUILTIN_FOG shaders/builtin/fog/*.hlsl )
#file(GLOB SHADERS_BUILTIN_LEGACY shaders/builtin/legacy/*.hlsl )
#file(GLOB SHADERS_BUILTIN_LIGHTING shaders/builtin/lighting/*.hlsl )
#file(GLOB SHADERS_BUILTIN_POST shaders/builtin/post/*.hlsl )
#file(GLOB SHADERS_BUILTIN_SSAO shaders/builtin/SSAO/*.hlsl )
#file(GLOB SHADERS_BUILTIN_SSGI shaders/builtin/SSGI/*.hlsl )
#file(GLOB SHADERS_BUILTIN_VIDEO shaders/builtin/video/*.hlsl )
#file(GLOB SHADERS_BUILTIN_VR shaders/builtin/VR/*.hlsl )
file(GLOB IRRXML_INCLUDES libs/irrxml/src/*.h)
file(GLOB IRRXML_SOURCES libs/irrxml/src/*.cpp)
@ -1139,17 +1140,18 @@ source_group("renderer\\Vulkan" FILES ${RENDERER_VULKAN_SOURCES})
source_group("renderer\\SMAA" FILES ${RENDERER_SMAA_INCLUDES})
source_group("renderer\\Shaders" FILES ${SHADERS})
source_group("renderer\\Shaders\\builtin" FILES ${SHADERS_BUILTIN})
source_group("renderer\\Shaders\\builtin\\debug" FILES ${SHADERS_BUILTIN_DEBUG})
source_group("renderer\\Shaders\\builtin\\fog" FILES ${SHADERS_BUILTIN_FOG})
source_group("renderer\\Shaders\\builtin\\legacy" FILES ${SHADERS_BUILTIN_LEGACY})
source_group("renderer\\Shaders\\builtin\\lighting" FILES ${SHADERS_BUILTIN_LIGHTING})
source_group("renderer\\Shaders\\builtin\\post" FILES ${SHADERS_BUILTIN_POST})
source_group("renderer\\Shaders\\builtin\\SSAO" FILES ${SHADERS_BUILTIN_SSAO})
source_group("renderer\\Shaders\\builtin\\SSGI" FILES ${SHADERS_BUILTIN_SSGI})
source_group("renderer\\Shaders\\builtin\\video" FILES ${SHADERS_BUILTIN_VIDEO})
source_group("renderer\\Shaders\\builtin\\VR" FILES ${SHADERS_BUILTIN_VR})
# SRS - not needed, since handled by CMakeLists.txt for Shaders target
#source_group("renderer\\Shaders" FILES ${SHADERS})
#source_group("renderer\\Shaders\\builtin" FILES ${SHADERS_BUILTIN})
#source_group("renderer\\Shaders\\builtin\\debug" FILES ${SHADERS_BUILTIN_DEBUG})
#source_group("renderer\\Shaders\\builtin\\fog" FILES ${SHADERS_BUILTIN_FOG})
#source_group("renderer\\Shaders\\builtin\\legacy" FILES ${SHADERS_BUILTIN_LEGACY})
#source_group("renderer\\Shaders\\builtin\\lighting" FILES ${SHADERS_BUILTIN_LIGHTING})
#source_group("renderer\\Shaders\\builtin\\post" FILES ${SHADERS_BUILTIN_POST})
#source_group("renderer\\Shaders\\builtin\\SSAO" FILES ${SHADERS_BUILTIN_SSAO})
#source_group("renderer\\Shaders\\builtin\\SSGI" FILES ${SHADERS_BUILTIN_SSGI})
#source_group("renderer\\Shaders\\builtin\\video" FILES ${SHADERS_BUILTIN_VIDEO})
#source_group("renderer\\Shaders\\builtin\\VR" FILES ${SHADERS_BUILTIN_VR})
source_group("libs\\irrxml" FILES ${IRRXML_INCLUDES})
source_group("libs\\irrxml" FILES ${IRRXML_SOURCES})
@ -1336,17 +1338,18 @@ set(RBDOOM3_INCLUDES
${RENDERER_JOBS_STATICSHADOWVOLUME_INCLUDES}
${RENDERER_PASSES_INCLUDES}
${SHADERS}
${SHADERS_BUILTIN}
${SHADERS_BUILTIN_DEBUG}
${SHADERS_BUILTIN_FOG}
${SHADERS_BUILTIN_LEGACY}
${SHADERS_BUILTIN_LIGHTING}
${SHADERS_BUILTIN_POST}
${SHADERS_BUILTIN_SSAO}
${SHADERS_BUILTIN_SSGI}
${SHADERS_BUILTIN_VIDEO}
${SHADERS_BUILTIN_VR}
# SRS - not needed, since handled by CMakeLists.txt for Shaders target
#${SHADERS}
#${SHADERS_BUILTIN}
#${SHADERS_BUILTIN_DEBUG}
#${SHADERS_BUILTIN_FOG}
#${SHADERS_BUILTIN_LEGACY}
#${SHADERS_BUILTIN_LIGHTING}
#${SHADERS_BUILTIN_POST}
#${SHADERS_BUILTIN_SSAO}
#${SHADERS_BUILTIN_SSGI}
#${SHADERS_BUILTIN_VIDEO}
#${SHADERS_BUILTIN_VR}
${RENDERER_SMAA_INCLUDES}
${IRRXML_INCLUDES}
@ -1606,17 +1609,18 @@ if(MSVC)
)
endif()
set_source_files_properties( ${SHADERS} PROPERTIES VS_TOOL_OVERRIDE "None" )
set_source_files_properties( ${SHADERS_BUILTIN} PROPERTIES VS_TOOL_OVERRIDE "None" )
set_source_files_properties( ${SHADERS_BUILTIN_DEBUG} PROPERTIES VS_TOOL_OVERRIDE "None" )
set_source_files_properties( ${SHADERS_BUILTIN_FOG} PROPERTIES VS_TOOL_OVERRIDE "None" )
set_source_files_properties( ${SHADERS_BUILTIN_LEGACY} PROPERTIES VS_TOOL_OVERRIDE "None" )
set_source_files_properties( ${SHADERS_BUILTIN_LIGHTING} PROPERTIES VS_TOOL_OVERRIDE "None" )
set_source_files_properties( ${SHADERS_BUILTIN_POST} PROPERTIES VS_TOOL_OVERRIDE "None" )
set_source_files_properties( ${SHADERS_BUILTIN_SSAO} PROPERTIES VS_TOOL_OVERRIDE "None" )
set_source_files_properties( ${SHADERS_BUILTIN_SSGI} PROPERTIES VS_TOOL_OVERRIDE "None" )
set_source_files_properties( ${SHADERS_BUILTIN_VIDEO} PROPERTIES VS_TOOL_OVERRIDE "None" )
set_source_files_properties( ${SHADERS_BUILTIN_VR} PROPERTIES VS_TOOL_OVERRIDE "None" )
# SRS - not needed, since handled by CMakeLists.txt for Shaders target
#set_source_files_properties( ${SHADERS} PROPERTIES VS_TOOL_OVERRIDE "None" )
#set_source_files_properties( ${SHADERS_BUILTIN} PROPERTIES VS_TOOL_OVERRIDE "None" )
#set_source_files_properties( ${SHADERS_BUILTIN_DEBUG} PROPERTIES VS_TOOL_OVERRIDE "None" )
#set_source_files_properties( ${SHADERS_BUILTIN_FOG} PROPERTIES VS_TOOL_OVERRIDE "None" )
#set_source_files_properties( ${SHADERS_BUILTIN_LEGACY} PROPERTIES VS_TOOL_OVERRIDE "None" )
#set_source_files_properties( ${SHADERS_BUILTIN_LIGHTING} PROPERTIES VS_TOOL_OVERRIDE "None" )
#set_source_files_properties( ${SHADERS_BUILTIN_POST} PROPERTIES VS_TOOL_OVERRIDE "None" )
#set_source_files_properties( ${SHADERS_BUILTIN_SSAO} PROPERTIES VS_TOOL_OVERRIDE "None" )
#set_source_files_properties( ${SHADERS_BUILTIN_SSGI} PROPERTIES VS_TOOL_OVERRIDE "None" )
#set_source_files_properties( ${SHADERS_BUILTIN_VIDEO} PROPERTIES VS_TOOL_OVERRIDE "None" )
#set_source_files_properties( ${SHADERS_BUILTIN_VR} PROPERTIES VS_TOOL_OVERRIDE "None" )
list(APPEND RBDOOM3_SOURCES ${WIN32_RESOURCES})