Skip to content

Add support for older versions of CMake. #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
twifkak merged 4 commits into from
Jul 8, 2021
Merged

Add support for older versions of CMake. #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b66906
Add support for older versions of CMake.
twifkak Jul 8, 2021
a580daa
Add Travis tests for old CMake.
twifkak Jul 8, 2021
521b6a1
Disable tests for old cmake.
twifkak Jul 8, 2021
417e1e7
Set libdir and bindir for old cmake.
twifkak Jul 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,18 @@ matrix:
- cmake -DCMAKE_CXX_COMPILER=$CXX -DCMAKE_C_COMPILER=$CC ..
- make VERBOSE=1
- ctest --output-on-failure
- name: 'openssl-cmake_old'
os: linux
compiler: clang
before_script:
- source ./.travis/install_cmake_old.sh
- source ./.travis/install_openssl.sh
script:
- install -d build
- cd build
- cmake -DCMAKE_CXX_COMPILER=$CXX -DCMAKE_C_COMPILER=$CC -DRUN_TEST=off -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_BINDIR=bin ..
- make VERBOSE=1
- ctest --output-on-failure
- name: 'boringssl'
os: linux
compiler: clang
Expand All @@ -28,3 +40,17 @@ matrix:
- cmake -DCMAKE_CXX_COMPILER=$CXX -DCMAKE_C_COMPILER=$CC -DSXG_BUILD_SHARED=off -DSXG_BUILD_STATIC=on -DRUN_TEST=on -DSXG_WITH_CERT_CHAIN=off -DOPENSSL_CRYPTO_LIBRARY=${BORINGSSL_ROOT}/build/crypto/libcrypto.a -DOPENSSL_ROOT_DIR=${BORINGSSL_ROOT} -DOPENSSL_INCLUDE_DIR=${BORINGSSL_ROOT}/include ..
- make VERBOSE=1
- ctest --output-on-failure
- name: 'boringssl-cmake_old'
os: linux
compiler: clang
before_script:
- source ./.travis/install_cmake_old.sh
- source ./.travis/install_go.sh
- source ./.travis/install_boringssl.sh
script:
- go version
- install -d build
- cd build
- cmake -DCMAKE_CXX_COMPILER=$CXX -DCMAKE_C_COMPILER=$CC -DSXG_BUILD_SHARED=off -DSXG_BUILD_STATIC=on -DRUN_TEST=off -DSXG_WITH_CERT_CHAIN=off -DOPENSSL_CRYPTO_LIBRARY=${BORINGSSL_ROOT}/build/crypto/libcrypto.a -DOPENSSL_ROOT_DIR=${BORINGSSL_ROOT} -DOPENSSL_INCLUDE_DIR=${BORINGSSL_ROOT}/include -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_BINDIR=bin ..
- make VERBOSE=1
- ctest --output-on-failure
8 changes: 4 additions & 4 deletions .travis/install_cmake.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
mkdir ${DEPS_DIR} && pushd ${DEPS_DIR}
CMAKE="cmake-3.15.2-Linux-x86_64"
CMAKE_TAR="${CMAKE}.tar.gz"
travis_retry wget --no-check-certificate https://github.com/Kitware/CMake/releases/download/v3.15.2/${CMAKE_TAR}
travis_retry wget --no-check-certificate "https://github.com/Kitware/CMake/releases/download/v3.15.2/${CMAKE_TAR}"
echo "bf433a0e0674cfb358b127e7120dccaa ${CMAKE_TAR}" > cmake_md5.txt
md5sum -c cmake_md5.txt
tar -xf ${CMAKE_TAR}
mv ${CMAKE} cmake-install
export PATH=${DEPS_DIR}/cmake-install:${DEPS_DIR}/cmake-install/bin:$PATH
tar -xf "${CMAKE_TAR}"
mv "${CMAKE}" cmake-install
export "PATH=${DEPS_DIR}/cmake-install:${DEPS_DIR}/cmake-install/bin:$PATH"
popd
13 changes: 13 additions & 0 deletions .travis/install_cmake_old.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/sh

DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
mkdir ${DEPS_DIR} && pushd ${DEPS_DIR}
CMAKE="cmake-3.1.0-Linux-x86_64"
CMAKE_TAR="${CMAKE}.tar.gz"
travis_retry wget --no-check-certificate "https://github.com/Kitware/CMake/releases/download/v3.1.0/${CMAKE_TAR}"
echo "9fb313d98eac5eedc654a3164d33becd ${CMAKE_TAR}" > cmake_md5.txt
md5sum -c cmake_md5.txt
tar -xf "${CMAKE_TAR}"
mv "${CMAKE}" cmake-install
export "PATH=${DEPS_DIR}/cmake-install:${DEPS_DIR}/cmake-install/bin:$PATH"
popd
8 changes: 6 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,12 @@ endif ()

# When RUN_TEST is enabled, `target_link_options` used in fuzzing test requires 3.13.
# When RUN_TEST is disabled, I'm not sure what minimum version is required, but
# anecdotally it's higher than 3.0.
cmake_minimum_required (VERSION 3.13)
# it worked when tested at 3.1.
if (RUN_TEST)
cmake_minimum_required (VERSION 3.13)
else ()
cmake_minimum_required (VERSION 3.1)
endif ()

set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -std=c++11 -fPIC")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -std=c99 -fPIC -D_POSIX_C_SOURCE=200112L")
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Simple cmake project.
```ShellSession
$ mkdir build
$ cd build
$ cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=path/to/usr
$ cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=path/to/usr -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_BINDIR=bin
$ make sxg
$ sudo make install
```
Expand Down