CI: fix windows build disabling mimalloc override option (erigontech#…

…1479)
dorlevi · Aug 30, 2023 · a26e0e2 · a26e0e2
1 parent d3a76dc
commit a26e0e2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -56,7 +56,10 @@ jobs:
 
     - name: Configure CMake
       working-directory: C:\build
-      run: cmake ${{runner.workspace}}\silkworm -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }}
+      # Currently Conan Center has Windows binaries built only with msvc 16 only and mimalloc built only with option override=False
+      # In order to build mimalloc with override=True we need to switch to msvc 17 compiler but this would trigger a full rebuild from sources
+      # of all dependencies wasting a lot of time, so we prefer to turn off mimalloc override
+      run: cmake ${{runner.workspace}}\silkworm -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} -DCMAKE_CONAN_OPTIONS="mimalloc:override=False"
 
     - name: Build unit tests
       working-directory: C:\build

diff --git a/cmake/conan.cmake b/cmake/conan.cmake
@@ -56,5 +56,5 @@ conan_cmake_install(
   PATH_OR_REFERENCE "${CONAN_BINARY_DIR}"
   INSTALL_FOLDER "${CONAN_BINARY_DIR}"
   BUILD missing
-  PROFILE "${CMAKE_SOURCE_DIR}/cmake/profiles/${CONAN_PROFILE}"
+  PROFILE "${CMAKE_SOURCE_DIR}/cmake/profiles/${CONAN_PROFILE}" OPTIONS "${CMAKE_CONAN_OPTIONS}"
 )