Browse Source

ci: avoid `cmake -Hpath`

This is an undocumented option similar to the `-Spath' option introduced
in cmake 3.13.
Replace all instances of `-Hpath' with `-Spath' in macos workflow.
Replace `-H. -Bpath' with `mkdir path; cd ./path; cmake ..' in zuul
scripts since it runs an older version of cmake.

Fixes #9008
Closes #9014
Emanuele Torre 1 year ago
parent
commit
79f915e8ec
3 changed files with 12 additions and 4 deletions
  1. 1 1
      .github/workflows/macos.yml
  2. 7 2
      scripts/zuul/before_script.sh
  3. 4 1
      scripts/zuul/script.sh

+ 1 - 1
.github/workflows/macos.yml

@@ -149,7 +149,7 @@ jobs:
 
     - uses: actions/checkout@v3
 
-    - run: cmake -H. -Bbuild -DCURL_WERROR=ON -DPICKY_COMPILER=ON ${{ matrix.build.generate }}
+    - run: cmake -S. -Bbuild -DCURL_WERROR=ON -DPICKY_COMPILER=ON ${{ matrix.build.generate }}
       name: 'cmake generate'
 
     - run: cmake --build build

+ 7 - 2
scripts/zuul/before_script.sh

@@ -76,7 +76,10 @@ if [ "$TRAVIS_OS_NAME" = linux -a "$BORINGSSL" ]; then
   cd $HOME
   git clone --depth=1 https://boringssl.googlesource.com/boringssl
   cd boringssl
-  CXX="g++" CC="gcc" cmake -H. -Bbuild -GNinja -DCMAKE_BUILD_TYPE=release -DBUILD_SHARED_LIBS=1
+  mkdir -p build
+  cd ./build
+  CXX="g++" CC="gcc" cmake .. -GNinja -DCMAKE_BUILD_TYPE=release -DBUILD_SHARED_LIBS=1
+  cd ..
   cmake --build build
   mkdir lib
   cp ./build/crypto/libcrypto.so ./lib/
@@ -84,7 +87,9 @@ if [ "$TRAVIS_OS_NAME" = linux -a "$BORINGSSL" ]; then
   echo "BoringSSL lib dir: "`pwd`"/lib"
   cmake --build build --target clean
   rm -f build/CMakeCache.txt
-  CXX="g++" CC="gcc" cmake -H. -Bbuild -GNinja -DCMAKE_POSITION_INDEPENDENT_CODE=on
+  cd ./build
+  CXX="g++" CC="gcc" cmake .. -GNinja -DCMAKE_POSITION_INDEPENDENT_CODE=on
+  cd ..
   cmake --build build
   export LIBS=-lpthread
 fi

+ 4 - 1
scripts/zuul/script.sh

@@ -90,7 +90,10 @@ if [ "$T" = "tidy" ]; then
 fi
 
 if [ "$T" = "cmake" ]; then
-  cmake -H. -Bbuild -DCURL_WERROR=ON $C
+  mkdir -p build
+  cd ./build
+  cmake .. -DCURL_WERROR=ON $C
+  cd ..
   cmake --build build
   env TFLAGS="!1139 $TFLAGS" cmake --build build --target test-nonflaky
 fi