BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix glslangValidator installation

Browse source 
This caused the glslang[tools] vcpkg feature to not install properly,
because the glslangValidator executable didn't exist for tool
installation.
This commit is contained in:
friendlyanon 2024-07-02 19:55:24 +02:00 • committed by arcady-lunarg
parent 5939e32b87
commit f9fbc91d4f
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
StandAlone/CMakeLists.txt
View file

@ -90,21 +90,28 @@ endif()
# Create a symbolic link to glslang named glslangValidator for backwards compatibility # Create a symbolic link to glslang named glslangValidator for backwards compatibility
set(legacy_glslang_name "glslangValidator${CMAKE_EXECUTABLE_SUFFIX}") set(legacy_glslang_name "glslangValidator${CMAKE_EXECUTABLE_SUFFIX}")
set(link_method create_symlink) set(link_method create_symlink)
if (WIN32 OR MINGW) if(WIN32 OR MINGW)
set(link_method copy_if_different) set(link_method copy_if_different)
endif() endif()
add_custom_command(TARGET glslang-standalone
POST_BUILD add_custom_command(
COMMAND ${CMAKE_COMMAND} -E ${link_method} $<TARGET_FILE_NAME:glslang-standalone> ${legacy_glslang_name} TARGET glslang-standalone POST_BUILD
WORKING_DIRECTORY $<TARGET_FILE_DIR:glslang-standalone>) COMMAND "${CMAKE_COMMAND}" -E "${link_method}" "\$<TARGET_FILE_NAME:glslang-standalone>" "${legacy_glslang_name}"
WORKING_DIRECTORY "\$<TARGET_FILE_DIR:glslang-standalone>"
VERBATIM
)
if(GLSLANG_ENABLE_INSTALL) if(GLSLANG_ENABLE_INSTALL)
install(TARGETS glslang-standalone EXPORT glslang-targets) install(TARGETS glslang-standalone EXPORT glslang-targets)
# Create the same symlink at install time # Create the same symlink at install time
install(CODE "execute_process( \ install(CODE "\
COMMAND ${CMAKE_COMMAND} -E ${link_method} $<TARGET_FILE_NAME:glslang-standalone> ${legacy_glslang_name} \ message(STATUS \"Installing (${link_method}): \$<TARGET_FILE_NAME:glslang-standalone> -> \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}\")
WORKING_DIRECTORY \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})") execute_process(
COMMAND \"\${CMAKE_COMMAND}\" -E ${link_method} [=[\$<TARGET_FILE_NAME:glslang-standalone>]=] [=[${legacy_glslang_name}]=]
WORKING_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}\"
)
")
if(ENABLE_SPVREMAPPER) if(ENABLE_SPVREMAPPER)
install(TARGETS spirv-remap EXPORT glslang-targets) install(TARGETS spirv-remap EXPORT glslang-targets)