Skip to content

Commit 17df49e

Browse files
author
wuxianrong
committed
fix ci
1 parent 6dbb59f commit 17df49e

2 files changed

Lines changed: 19 additions & 2 deletions

File tree

.github/workflows/pika.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,19 @@ jobs:
3636
sudo apt-get update
3737
sudo apt-get install -y autoconf libprotobuf-dev protobuf-compiler clang-tidy
3838
39+
- name: Check CMake version
40+
run: cmake --version
41+
3942
- name: Configure CMake
4043
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
4144
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
42-
run: cmake -B build -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DUSE_PIKA_TOOLS=ON -DCMAKE_CXX_FLAGS_DEBUG=-fsanitize=address -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
45+
run: cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -B build -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DUSE_PIKA_TOOLS=ON -DCMAKE_CXX_FLAGS_DEBUG=-fsanitize=address -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
4346

4447
- name: Build
4548
# Build your program with the given configuration
46-
run: cmake --build build --config ${{ env.BUILD_TYPE }}
49+
run: |
50+
cmake --build build --config ${{ env.BUILD_TYPE }} || true
51+
tail -n 50 buildtrees/Stamp/gflags-configure-err.log
4752
4853
- name: Cleanup
4954
run: |

CMakeLists.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ ExternalProject_Add(gtest
150150
LOG_INSTALL
151151
1
152152
CMAKE_ARGS
153+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
153154
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
154155
-DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}
155156
BUILD_ALWAYS
@@ -191,6 +192,7 @@ ExternalProject_Add(gflags
191192
BUILD_ALWAYS
192193
1
193194
CMAKE_ARGS
195+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
194196
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
195197
-DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}
196198
-DGFLAGS_NAMESPACE=gflags
@@ -265,6 +267,7 @@ ExternalProject_Add(glog
265267
BUILD_ALWAYS
266268
1
267269
CMAKE_ARGS
270+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
268271
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
269272
-DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}
270273
-DWITH_GFLAGS=ON
@@ -306,6 +309,7 @@ ExternalProject_Add(snappy
306309
LOG_INSTALL
307310
1
308311
CMAKE_ARGS
312+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
309313
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
310314
-DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}
311315
-DSNAPPY_BUILD_TESTS=OFF
@@ -344,6 +348,7 @@ ExternalProject_Add(zstd
344348
SOURCE_SUBDIR
345349
build/cmake
346350
CMAKE_ARGS
351+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
347352
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
348353
-DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}
349354
-DBUILD_TESTING=OFF
@@ -380,6 +385,7 @@ ExternalProject_Add(fmt
380385
LOG_INSTALL
381386
1
382387
CMAKE_ARGS
388+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
383389
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
384390
-DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}
385391
BUILD_ALWAYS
@@ -421,6 +427,7 @@ ExternalProject_Add(lz4
421427
SOURCE_SUBDIR
422428
build/cmake
423429
CMAKE_ARGS
430+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
424431
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
425432
-DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}
426433
-DBUILD_TESTING=OFF
@@ -457,6 +464,7 @@ ExternalProject_Add(zlib
457464
LOG_INSTALL
458465
1
459466
CMAKE_ARGS
467+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
460468
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
461469
-DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}
462470
-DZLIB_USE_STATIC_LIBS=ON
@@ -488,6 +496,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
488496
LOG_INSTALL
489497
1
490498
CMAKE_ARGS
499+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
491500
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
492501
-DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}
493502
-DGPERFTOOLS_BUILD_STATIC=ON
@@ -556,6 +565,7 @@ ExternalProject_Add(protobuf
556565
SOURCE_SUBDIR
557566
cmake
558567
CMAKE_ARGS
568+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
559569
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
560570
-DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}
561571
-DBUILD_SHARED_LIBS=FALSE
@@ -605,6 +615,7 @@ ExternalProject_Add(rocksdb
605615
BUILD_ALWAYS
606616
1
607617
CMAKE_ARGS
618+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
608619
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
609620
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
610621
-DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}
@@ -646,6 +657,7 @@ ExternalProject_Add(rediscache
646657
SOURCE_SUBDIR
647658
""
648659
CMAKE_ARGS
660+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
649661
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
650662
-DCMAKE_INSTALL_INCLUDEDIR=${INSTALL_INCLUDEDIR}
651663
-DCMAKE_INSTALL_LIBDIR=${INSTALL_LIBDIR}

0 commit comments

Comments
 (0)