Skip to content

Commit 212fdd6

Browse files
committed
fix ci issues. set cxx standard to 14 by default for third party installs.
1 parent 916aed0 commit 212fdd6

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/workflows/cmake_install.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,11 @@ jobs:
7373
- name: Setup CI Environment
7474
run: |
7575
sudo -E ./ci/setup_ci_environment.sh
76+
sudo -E ./ci/setup_googletest.sh
7677
- name: Install Dependencies
7778
run: |
7879
sudo -E apt-get update
79-
sudo -E apt-get install -y libgmock-dev libgtest-dev libbenchmark-dev libabsl-dev libcurl4-openssl-dev zlib1g-dev nlohmann-json3-dev libprotobuf-dev libgrpc++-dev protobuf-compiler protobuf-compiler-grpc
80+
sudo -E apt-get install -y libbenchmark-dev libabsl-dev libcurl4-openssl-dev zlib1g-dev nlohmann-json3-dev libprotobuf-dev libgrpc++-dev protobuf-compiler protobuf-compiler-grpc
8081
- name: Run Tests (static libs)
8182
env:
8283
BUILD_SHARED_LIBS: 'OFF'

install/cmake/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ else()
6767
set(USE_SUBMODULES OFF)
6868
endif()
6969

70-
if(NOT DEFINED CMAKE_CXX_STANDARD)
71-
set(CMAKE_CXX_STANDARD 17)
70+
if(NOT CMAKE_CXX_STANDARD)
71+
set(CMAKE_CXX_STANDARD 14)
7272
endif()
7373

7474
set(CMAKE_OPTIONS

0 commit comments

Comments
 (0)