From 0f654d7d18ad5cd8d4998dce48af0a666cf29e2f Mon Sep 17 00:00:00 2001 From: Rigidity Date: Sun, 22 Sep 2024 14:26:49 -0400 Subject: [PATCH] Test thing --- .github/workflows/rust.yml | 4 +++- src/CMakeLists.txt | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 4caeba69..3f267b64 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -100,7 +100,9 @@ jobs: - name: Install MPIR on Windows if: matrix.os.name == 'Windows' - run: vcpkg install mpir:x64-windows-static + run: | + vcpkg install mpir:x64-windows-static + git clone https://github.com/Chia-Network/mpir_gc_x64.git - name: Set up Rust uses: dtolnay/rust-toolchain@stable diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 651e17cf..22cb6624 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -31,11 +31,11 @@ if(WIN32) ${MPIR_INCLUDE_DIR} ) find_library(MPIR_LIBRARY NAMES mpir PATHS ${MPIR_LIBRARY_DIR} NO_DEFAULT_PATH) - if(MPIR_LIBRARY) + if(SKIP_MPIR_LINK) + message(STATUS "MPIR library found, skipping linking") + elseif(MPIR_LIBRARY) message(STATUS "MPIR library found at ${MPIR_LIBRARY}") link_libraries(${MPIR_LIBRARY}) - elseif(SKIP_MPIR_LINK) - message(STATUS "MPIR library not found, skipping linking") else() message(FATAL_ERROR "MPIR library not found") endif()