Merge branch 'skia_2024'

Author: djowel

docs/modules/ROOT/pages/setup.adoc

@@ -160,7 +160,7 @@ cd build
 You will need to tell cmake the location of the vcpkg toolchain file. That way, `find_package` will know where to find the installed libraries. If you installed vcpkg in `c:\` as suggested, you invoke cmake like this:
 
 ----
-cmake -G"Visual Studio 17 2022" -D CMAKE_TOOLCHAIN_FILE=c:/vcpkg/scripts/buildsystems/vcpkg ../
+cmake -G"Visual Studio 17 2022" -D CMAKE_TOOLCHAIN_FILE=c:/vcpkg/scripts/buildsystems/vcpkg.cmake ../
 ----
 
 If successful, cmake will generate a Visual Studio solution in the build directory. Open the project file `elements.sln` and build all. You should see a couple of example applications.
@@ -183,7 +183,7 @@ cd build
 Again, you will need to tell cmake the location of the vcpkg toolchain file. If you installed vcpkg in `c:\` as suggested, you invoke cmake like this:
 
 ----
-cmake -G"NMake Makefiles" -D CMAKE_TOOLCHAIN_FILE=c:/vcpkg/scripts/buildsystems/vcpkg ../
+cmake -G"NMake Makefiles" -D CMAKE_TOOLCHAIN_FILE=c:/vcpkg/scripts/buildsystems/vcpkg.cmake ../
 ----
 
 If successful, cmake will generate NMake Make files in the build directory. Invoke `nmake` to build the binary.

lib/CMakeLists.txt

@@ -203,7 +203,7 @@ target_compile_options(elements PRIVATE
 
 if (MSVC)
    # Kinda silly to have to do this: https://bit.ly/2ZXjzzn
-   STRING(REGEX REPLACE "/W3" "/W4" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+   STRING(REGEX REPLACE "/W3" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 endif()
 
 if (APPLE)