push windows

Multi-V-VM · Feb 28, 2024 · ba34ef9 · ba34ef9
1 parent 0816e71
commit ba34ef9
Show file tree

Hide file tree

Showing 6 changed files with 303 additions and 142 deletions.
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -36,7 +36,7 @@ jobs:
         cd vcpkg
         git checkout a56d892ac792797d779eae79d3423e0131422628
         ./bootstrap-vcpkg.bat
-        ./vcpkg install fmt:x64-windows cxxopts:x64-windows spdlog:x64-windows
+        ./vcpkg install fmt:x64-windows cxxopts:x64-windows spdlog:x64-windows detours:x64-windows
         echo "C:/tools/msys64/usr/bin/" >> "$GITHUB_PATH"
         C:/tools/msys64/usr/bin/pacman.exe --noconfirm -S gcc
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -50,7 +50,11 @@ else ()
     set(CMAKE_MSVC_RUNTIME_LIBRARY "")
     set(CMAKE_GENERATOR_PLATFORM "")
     set(CMAKE_CXX_FLAGS "/MD")
-    set(WIN_EXTRA_LIBS uvwasi_a uv_a ws2_32)
+    find_library(DETOURS_LIBRARY detours REQUIRED)
+    find_path(DETOURS_INCLUDE_DIRS "detours/detours.h")
+    find_library(DETOURS_LIBRARY detours REQUIRED)
+    set(WIN_EXTRA_LIBS uvwasi_a msvcrt.lib libcmt.lib ${DETOURS_LIBRARY} uv_a ws2_32)
+    include_directories(${DETOURS_INCLUDE_DIRS})
 if(MVVM_BUILD_TEST)
     set(BLAS_LIBRARIES "C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v12.1/lib/x64/cublas.lib" "C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v12.1/lib/x64/cudart.lib")
     set(BLAS_INCLUDE_DIRS "C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v12.1/include/")