typos and old cmake behavior for cmake _ROOT

benbovy · Aug 19, 2024 · 0472c4b · 0472c4b
1 parent 2be2923
commit 0472c4b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -40,7 +40,7 @@ jobs:
       ABSL_VERSION: "20240722.0"
       S2GEOMETRY_VERSION: "0.11.1"
       S2GEOGRAPHY_VERSION: "0.1.2"
-      CXX_STANDARD: "17"
+      CXX_STANDARD: 17
     strategy:
       fail-fast: false
       matrix:
@@ -83,21 +83,21 @@ jobs:
             ABSL_VERSION=${{ env.ABSL_VERSION }}
             S2GEOMETRY_VERSION=${{ env.S2GEOMETRY_VERSION }}
             S2GEOGRAPHY_VERSION=${{ env.S2GEOGRAPHY_VERSION }}
-            CXXSTANDARD=${{ env.CXXSTANDARD }}
+            CXX_STANDARD=${{ env.CXX_STANDARD }}
           CIBW_ENVIRONMENT_MACOS:
             DEPENDENCIES_DIR=${{ runner.temp }}/3rd-party
             ABSL_VERSION=${{ env.ABSL_VERSION }}
             S2GEOMETRY_VERSION=${{ env.S2GEOMETRY_VERSION }}
             S2GEOGRAPHY_VERSION=${{ env.S2GEOGRAPHY_VERSION }}
-            CXXSTANDARD=${{ env.CXXSTANDARD }}
+            CXX_STANDARD=${{ env.CXX_STANDARD }}
             MACOSX_DEPLOYMENT_TARGET=10.9
             CMAKE_OSX_ARCHITECTURES='${{ matrix.cmake_osx_architectures }}'
           CIBW_ENVIRONMENT_WINDOWS:
             DEPENDENCIES_DIR='${{ runner.temp }}\3rd-party'
             ABSL_VERSION=${{ env.ABSL_VERSION }}
             S2GEOMETRY_VERSION=${{ env.S2GEOMETRY_VERSION }}
             S2GEOGRAPHY_VERSION=${{ env.S2GEOGRAPHY_VERSION }}
-            CXXSTANDARD=${{ env.CXXSTANDARD }}
+            CXX_STANDARD=${{ env.CXX_STANDARD }}
           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.sh b/ci/install_3rdparty.sh
@@ -7,7 +7,7 @@
 #  - ABSL_VERSION
 #  - S2GEOMETRY_VERSION
 #  - S2GEOGRAPHY_VERSION
-#  - CXXSTANDARD
+#  - CXX_STANDARD
 #
 # This script assumes that library sources have been downloaded or copied in
 # DEPENDENCIES_DIR (e.g., $DEPENDENCIES_DIR/absl-src-$ABSL_VERSION).
@@ -27,6 +27,9 @@ elif [ -z "$S2GEOMETRY_VERSION" ]; then
 elif [ -z "$S2GEOGRAPHY_VERSION" ]; then
     echo "S2GEOGRAPHY_VERSION must be set"
     exit 1
+elif [ -z "$CXX_STANDARD" ]; then
+    echo "CXX_STANDARD must be set"
+    exit 1
 fi
 
 SRC_DIR=$DEPENDENCIES_DIR/src
@@ -78,7 +81,7 @@ build_install_dependencies(){
 
     cmake -S $SRC_DIR/s2geometry-$S2GEOMETRY_VERSION -B $S2GEOMETRY_BUILD_DIR \
         -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR \
-        -DABSL_ROOT=$INSTALL_DIR \
+        -Dabsl_ROOT=$INSTALL_DIR \
         -DBUILD_TESTS=OFF \
         -DBUILD_EXAMPLES=OFF \
         -UGOOGLETEST_ROOT \
@@ -99,7 +102,7 @@ build_install_dependencies(){
     cmake -S $SRC_DIR/s2geography-$S2GEOGRAPHY_VERSION -B $S2GEOGRAPHY_BUILD_DIR \
         -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR \
         -DABSL_ROOT=$INSTALL_DIR \
-        -DS2_ROOT=$INSTALL_DIR \
+        -Ds2_ROOT=$INSTALL_DIR \
         -DBUILD_TESTS=OFF \
         -DS2GEOGRAPHY_S2_SOURCE=SYSTEM \
         -DBUILD_EXAMPLES=OFF \