File tree Expand file tree Collapse file tree 4 files changed +4
-14
lines changed Expand file tree Collapse file tree 4 files changed +4
-14
lines changed Original file line number Diff line number Diff line change 22# Distributed under the MIT software license, see the accompanying
33# file COPYING or http://www.opensource.org/licenses/mit-license.php.
44
5- cmake_minimum_required (VERSION 3.12 )
5+ cmake_minimum_required (VERSION 3.22 )
66
77project ("Libmultiprocess" CXX)
88if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
Original file line number Diff line number Diff line change 11CI_DESC=" CI job using old Cap'n Proto and cmake versions"
22CI_DIR=build-olddeps
33export CXXFLAGS=" -Werror -Wall -Wextra -Wpedantic -Wno-unused-parameter -Wno-error=array-bounds"
4- NIX_ARGS=(--argstr capnprotoVersion " 0.7.1" --argstr cmakeVersion " 3.12.4 " )
4+ NIX_ARGS=(--argstr capnprotoVersion " 0.7.1" --argstr cmakeVersion " 3.22.6 " )
55BUILD_ARGS=(-k)
Original file line number Diff line number Diff line change 1818[ -n " ${CI_CLEAN-} " ] && rm -rf " ${CI_DIR} "
1919
2020cmake --version
21- cmake_ver=$( cmake --version | awk ' /version/{print $3; exit}' )
22- ver_ge () { [ " $( printf ' %s\n' " $2 " " $1 " | sort -V | head -n1) " = " $2 " ]; }
2321
2422src_dir=$PWD
2523mkdir -p " $CI_DIR "
2624cd " $CI_DIR "
2725cmake " $src_dir " " ${CMAKE_ARGS[@]+" ${CMAKE_ARGS[@]} " } "
28- if ver_ge " $cmake_ver " " 3.15" ; then
29- cmake --build . -t " ${BUILD_TARGETS[@]} " -- " ${BUILD_ARGS[@]+" ${BUILD_ARGS[@]} " } "
30- else
31- # Older versions of cmake can only build one target at a time with --target,
32- # and do not support -t shortcut
33- for t in " ${BUILD_TARGETS[@]} " ; do
34- cmake --build . --target " $t " -- " ${BUILD_ARGS[@]+" ${BUILD_ARGS[@]} " } "
35- done
36- fi
26+ cmake --build . -t " ${BUILD_TARGETS[@]} " -- " ${BUILD_ARGS[@]+" ${BUILD_ARGS[@]} " } "
3727ctest --output-on-failure
Original file line number Diff line number Diff line change 3939 clang = if enableLibcxx then llvm . libcxxClang else llvm . clang ;
4040 clang-tools = llvm . clang-tools . override { inherit enableLibcxx ; } ;
4141 cmakeHashes = {
42- "3.12.4 " = "sha256-UlVYS/0EPrcXViz/iULUcvHA5GecSUHYS6raqbKOMZQ=" ;
42+ "3.22.6 " = "sha256-UlVYS/0EPrcXViz/iULUcvHA5GecSUHYS6raqbKOMZQ=" ;
4343 } ;
4444 cmakeBuild = if cmakeVersion == null then pkgs . cmake else ( pkgs . cmake . overrideAttrs ( old : {
4545 version = cmakeVersion ;
You can’t perform that action at this time.
0 commit comments