Update escaped SYSROOT_PATH and TEST_SHARED_LIBRARY_PATH for preloading

Author: mcbarton

unittests/CppInterOp/CMakeLists.txt

@@ -24,9 +24,7 @@ add_cppinterop_unittest(CppInterOpTests
 )
 
 if(EMSCRIPTEN)
-  if (SYSROOT_PATH MATCHES "@")
-    string(REPLACE "@" "@@" SYSROOT_PATH "${SYSROOT_PATH}")
-  endif()
+  string(REPLACE "@" "@@" ESCAPED_SYSROOT_PATH "${SYSROOT_PATH}")
   # Explanation of Emscripten-specific link flags for CppInterOpTests:
   #
   # MAIN_MODULE=1:
@@ -58,7 +56,7 @@ if(EMSCRIPTEN)
     PUBLIC "SHELL: -s ALLOW_MEMORY_GROWTH=1"
     PUBLIC "SHELL: -s STACK_SIZE=32mb"
     PUBLIC "SHELL: -s INITIAL_MEMORY=128mb"
-    PUBLIC "SHELL: --preload-file ${SYSROOT_PATH}/include@/include"
+    PUBLIC "SHELL: --preload-file ${ESCAPED_SYSROOT_PATH}/include@/include"
     PUBLIC "SHELL: --emrun"
   )
 endif()
@@ -100,9 +98,7 @@ target_link_libraries(DynamicLibraryManagerTests
 
 if(EMSCRIPTEN)
   set(TEST_SHARED_LIBRARY_PATH "${CMAKE_CURRENT_BINARY_DIR}/TestSharedLib/unittests/bin/Release/")
-  if (TEST_SHARED_LIBRARY_PATH MATCHES "@")
-    string(REPLACE "@" "@@" TEST_SHARED_LIBRARY_PATH "${TEST_SHARED_LIBRARY_PATH}")
-  endif()
+  string(REPLACE "@" "@@" ESCAPED_TEST_SHARED_LIBRARY_PATH "${TEST_SHARED_LIBRARY_PATH}")
   # Check explanation of Emscripten-specific link flags for CppInterOpTests above for DynamicLibraryManagerTests as well.
   target_link_options(DynamicLibraryManagerTests
     PUBLIC "SHELL: -s MAIN_MODULE=1"
@@ -112,7 +108,7 @@ if(EMSCRIPTEN)
     PUBLIC "SHELL: -s INITIAL_MEMORY=128mb"
     PUBLIC "SHELL: --preload-file ${SYSROOT_PATH}/include@/include"
     PUBLIC "SHELL: --emrun"
-    PUBLIC "SHELL: --preload-file ${TEST_SHARED_LIBRARY_PATH}/libTestSharedLib.so@/libTestSharedLib.so"
+    PUBLIC "SHELL: --preload-file ${ESCAPED_TEST_SHARED_LIBRARY_PATH}/libTestSharedLib.so@/libTestSharedLib.so"
   )
 endif()