Commit e671a693 by Ben Clayton

Fix ICD generation on windows.

The ICD_LIBRARY_PATH variable needs to be double-escaped - once for CMake, and another for the actual .json file. Bug b/116336664 Change-Id: I8fd68c6a030b689e6432828ec5f1cf938c2a0d45 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/34455Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Tested-by: 's avatarBen Clayton <bclayton@google.com>
parent e6092f3b
...@@ -2022,7 +2022,7 @@ if(BUILD_VULKAN) ...@@ -2022,7 +2022,7 @@ if(BUILD_VULKAN)
set(ICD_LIBRARY_PATH "libvk_swiftshader${CMAKE_SHARED_LIBRARY_SUFFIX}") set(ICD_LIBRARY_PATH "libvk_swiftshader${CMAKE_SHARED_LIBRARY_SUFFIX}")
if(WIN32) if(WIN32)
# The path is output to a JSON file, which requires backslashes to be escaped. # The path is output to a JSON file, which requires backslashes to be escaped.
set(ICD_LIBRARY_PATH ".\\${ICD_LIBRARY_PATH}") set(ICD_LIBRARY_PATH ".\\\\${ICD_LIBRARY_PATH}")
else() else()
set(ICD_LIBRARY_PATH "./${ICD_LIBRARY_PATH}") set(ICD_LIBRARY_PATH "./${ICD_LIBRARY_PATH}")
endif() endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment