diff options
| author | Emanuele Torre <torreemanuele6@gmail.com> | 2022-06-15 20:00:42 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2022-06-22 10:43:07 +0200 |
| commit | 79f915e8ec53fb4f8dde981be1e432bd6ac6c875 (patch) | |
| tree | e09aff539c3a033c693f0ccf8709bf1ce1c8a340 /scripts | |
| parent | 8b83fbfe8295b257eba5341051873ce4e9078d69 (diff) | |
| download | curl-79f915e8ec53fb4f8dde981be1e432bd6ac6c875.tar.gz | |
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
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/zuul/before_script.sh | 9 | ||||
| -rwxr-xr-x | scripts/zuul/script.sh | 5 |
2 files changed, 11 insertions, 3 deletions
diff --git a/scripts/zuul/before_script.sh b/scripts/zuul/before_script.sh index 7a386f674..a40bf6ecf 100755 --- a/scripts/zuul/before_script.sh +++ b/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 diff --git a/scripts/zuul/script.sh b/scripts/zuul/script.sh index 11a682081..8a800232e 100755 --- a/scripts/zuul/script.sh +++ b/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 |