openssl install dir was not right yet

benbovy · Sep 3, 2024 · 2ceb155 · 2ceb155
1 parent eafbe95
commit 2ceb155
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -130,7 +130,7 @@ jobs:
             S2GEOMETRY_VERSION=${{ env.S2GEOMETRY_VERSION }}
             S2GEOGRAPHY_VERSION=${{ env.S2GEOGRAPHY_VERSION }}
             CXX_STANDARD=${{ env.CXX_STANDARD }}
-            OPENSSL_ROOT_DIR=${{ env.VCPKG_INSTALLATION_ROOT }}
+            OPENSSL_ROOT_DIR=${{ env.VCPKG_INSTALLATION_ROOT }}\packages\openssl_x64-windows-static-md
           CIBW_BEFORE_ALL: ./ci/install_3rdparty.sh
           CIBW_BEFORE_ALL_WINDOWS: ci\install_3rdparty.cmd
           CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel

diff --git a/ci/install_3rdparty.cmd b/ci/install_3rdparty.cmd
@@ -64,6 +64,7 @@ cmake -GNinja ^
     -S %SRC_DIR%/s2geometry-%S2GEOMETRY_VERSION% ^
     -B %S2GEOMETRY_BUILD_DIR% ^
     -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% ^
+    -DOPENSSL_ROOT_DIR=%OPENSSL_ROOT_DIR% ^
     -DBUILD_TESTS=OFF ^
     -DBUILD_EXAMPLES=OFF ^
     -UGOOGLETEST_ROOT ^
@@ -91,6 +92,7 @@ cmake -GNinja ^
     -S %SRC_DIR%/s2geography-%S2GEOGRAPHY_VERSION% ^
     -B %S2GEOGRAPHY_BUILD_DIR% ^
     -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% ^
+    -DOPENSSL_ROOT_DIR=%OPENSSL_ROOT_DIR% ^
     -DS2GEOGRAPHY_BUILD_TESTS=OFF ^
     -DS2GEOGRAPHY_S2_SOURCE=AUTO ^
     -DS2GEOGRAPHY_BUILD_EXAMPLES=OFF ^