commit e671a6937e36f80caf46d4490134cd45535a649d
author Ben Clayton <bclayton@google.com> Mon Jul 29 13:03:42 2019 +0100
committer Ben Clayton <bclayton@google.com> Tue Jul 30 10:50:57 2019 +0000
tree 7a3a267ec4c1456b065739c742152aed7ab99698
parent e6092f3bc901f8c071541ba7a54f21dd4b9d35b0

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/+/34455
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Tested-by: Ben Clayton <bclayton@google.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87668b7..297e34c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2022,7 +2022,7 @@
     set(ICD_LIBRARY_PATH "libvk_swiftshader${CMAKE_SHARED_LIBRARY_SUFFIX}")
     if(WIN32)
         # 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()
         set(ICD_LIBRARY_PATH "./${ICD_LIBRARY_PATH}")
     endif()