Skip to content

Commit 70d5c2e

Browse files
committed
[C] Use CMake 3.6.1 as a minimum version.
1 parent a1960ff commit 70d5c2e

File tree

2 files changed

+24
-9
lines changed

2 files changed

+24
-9
lines changed

.github/workflows/ci.yml

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010

1111
env:
1212
GRADLE_OPTS: "-Dorg.gradle.daemon=false"
13+
CMAKE_VERSION: "3.6.1"
1314

1415
jobs:
1516
java-build:
@@ -112,8 +113,12 @@ jobs:
112113
- name: Install compiler
113114
run: |
114115
sudo apt-get install -y g++-${{ matrix.version }} libsparsehash-dev
116+
117+
curl -O -L https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
118+
tar xf cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
119+
echo "::add-path::cmake-${CMAKE_VERSION}-Linux-x86_64/bin"
115120
- name: Build
116-
run: ./cppbuild/cppbuild
121+
run: cmake --version && ./cppbuild/cppbuild
117122

118123
cpp-clang-build:
119124
name: C++ Clang ${{ matrix.version }}
@@ -147,27 +152,31 @@ jobs:
147152
sudo apt-get update
148153
149154
sudo apt-get install -y clang-${{ matrix.version }} libsparsehash-dev
155+
156+
curl -O -L https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
157+
tar xf cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
158+
echo "::add-path::cmake-${CMAKE_VERSION}-Linux-x86_64/bin"
150159
- name: Build
151-
run: ./cppbuild/cppbuild
160+
run: cmake --version && ./cppbuild/cppbuild
152161

153162
cpp-clang-macos-build:
154163
name: C++ Xcode ${{ matrix.version }} (macOS)
155164
runs-on: macOS-latest
156165
strategy:
157166
fail-fast: false
158-
matrix:
159-
version: [ '11.2.1' ]
160167
env:
161168
CC: clang
162169
CXX: clang++
163170
steps:
164171
- name: Checkout code
165172
uses: actions/checkout@v2
166-
- name: Install compiler
173+
- name: Install CMake
167174
run: |
168-
sudo xcode-select -switch /Applications/Xcode_${{ matrix.version }}.app
175+
curl -O -L https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Darwin-x86_64.tar.gz
176+
tar xf cmake-${CMAKE_VERSION}-Darwin-x86_64.tar.gz
177+
echo "::add-path::cmake-${CMAKE_VERSION}-Darwin-x86_64/bin"
169178
- name: Build
170-
run: ./cppbuild/cppbuild
179+
run: cmake --version && ./cppbuild/cppbuild
171180

172181
cpp-msvc-build:
173182
name: C++ MSVC (Windows)
@@ -180,5 +189,11 @@ jobs:
180189
steps:
181190
- name: Checkout code
182191
uses: actions/checkout@v2
192+
- name: Install CMake
193+
run: |
194+
$client = new-object System.Net.WebClient
195+
$client.DownloadFile("https://github.com/Kitware/CMake/releases/download/v$Env:CMAKE_VERSION/cmake-$Env:CMAKE_VERSION-win64-x64.zip","cmake-$Env:CMAKE_VERSION-win64-x64.zip")
196+
7z x cmake-$Env:CMAKE_VERSION-win64-x64.zip
197+
echo "::add-path::cmake-$Env:CMAKE_VERSION-win64-x64/bin"
183198
- name: Build
184199
run: cppbuild/cppbuild.cmd

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
# limitations under the License.
1515
#
1616

17-
cmake_minimum_required(VERSION 3.1.3 FATAL_ERROR)
18-
cmake_policy(VERSION 3.1.3)
17+
cmake_minimum_required(VERSION 3.6.1 FATAL_ERROR)
18+
cmake_policy(VERSION 3.6.1)
1919

2020
file(STRINGS version.txt SBE_VERSION_TXT LIMIT_COUNT 1 REGEX "^[0-9]+(\\.[0-9]+)+")
2121
string(REGEX REPLACE "^([0-9]+(\\.[0-9]+)+).*$" "\\1" SBE_VERSION_NUMERIC "${SBE_VERSION_TXT}")

0 commit comments

Comments
 (0)