Skip to content

Commit 38f1f4a

Browse files
mikucionisaaumikucionisaau
authored
Upgraded the libraries and compiler to GCC-14 (#34)
- GCC-14 - GoogleBenchmark-1.9.2 - doctest-2.4.11 (unchanged) - boost-1.88.0 - xxHash-0.8.3
2 parents ee1de67 + 1242e77 commit 38f1f4a

6 files changed

Lines changed: 55 additions & 9 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.23)
22
cmake_policy(SET CMP0048 NEW) # project() command manages VERSION variables
3-
project(UUtils VERSION 2.0.6 HOMEPAGE_URL "https://github.com/UPPAALModelChecker/UUtils" LANGUAGES CXX C)
3+
project(UUtils VERSION 2.0.7 HOMEPAGE_URL "https://github.com/UPPAALModelChecker/UUtils" LANGUAGES CXX C)
44
include(CMakePackageConfigHelpers)
55
include(GNUInstallDirs)
66
include(FetchContent)

‎cmake/stdcpp.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set(CMAKE_CXX_STANDARD 17)
1+
set(CMAKE_CXX_STANDARD 23)
22
set(CMAKE_CXX_STANDARD_REQUIRED ON)
33
set(CMAKE_CXX_EXTENSIONS OFF)
44
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -12,4 +12,4 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
1212
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
1313
add_compile_options(/W4)
1414
endif()
15-
endif ()
15+
endif ()

‎cmake/toolchain/i686-linux-gcc14.cmake‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# the name of the target operating system
2+
set(CMAKE_SYSTEM_NAME Linux)
3+
4+
# which compilers to use for C and C++
5+
set(CMAKE_C_COMPILER gcc-14)
6+
set(CMAKE_C_FLAGS -m32)
7+
set(CMAKE_CXX_COMPILER g++-14)
8+
set(CMAKE_CXX_FLAGS -m32)
9+
set(CMAKE_ASM_FLAGS -m32)
10+
11+
# where is the target environment located
12+
set(CMAKE_FIND_ROOT_PATH "${CMAKE_PREFIX_PATH}")
13+
14+
# adjust the default behavior of the FIND_XXX() commands:
15+
# search programs in the host environment
16+
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
17+
18+
# search headers and libraries in the target environment
19+
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
20+
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

‎cmake/toolchain/x86_64-linux-gcc14.cmake‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# the name of the target operating system
2+
set(CMAKE_SYSTEM_NAME Linux)
3+
4+
# which compilers to use for C and C++
5+
set(CMAKE_C_COMPILER gcc-14)
6+
set(CMAKE_CXX_COMPILER g++-14)
7+
8+
# where is the target environment located
9+
set(CMAKE_FIND_ROOT_PATH "${CMAKE_PREFIX_PATH}")
10+
11+
# adjust the default behavior of the FIND_XXX() commands:
12+
# search programs in the host environment
13+
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
14+
15+
# search headers and libraries in the target environment
16+
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
17+
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

‎compile.sh‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,18 @@ for target in $targets ; do
6464
BUILD_SUFFIX=""
6565
BUILD_EXTRA=""
6666
case "$target" in
67+
x86_64-linux-gcc14*)
68+
BUILD_TARGET=x86_64-linux-gcc14
69+
;;
6770
x86_64-linux-gcc10*)
6871
BUILD_TARGET=x86_64-linux-gcc10
6972
;;
7073
x86_64-linux*)
7174
BUILD_TARGET=x86_64-linux
7275
;;
76+
i686-linux-gcc14*)
77+
BUILD_TARGET=i686-linux-gcc14
78+
;;
7379
i686-linux-gcc10*)
7480
BUILD_TARGET=i686-linux-gcc10
7581
;;
@@ -84,6 +90,9 @@ for target in $targets ; do
8490
BUILD_TARGET=i686-w64-mingw32
8591
export WINEPATH=$("$PROJECT_DIR"/winepath-for $BUILD_TARGET)
8692
;;
93+
x86_64-darwin-brew-gcc14-*)
94+
BUILD_TARGET=x86_64-darwin-brew-gcc14
95+
;;
8796
x86_64-darwin-brew-gcc10-*)
8897
BUILD_TARGET=x86_64-darwin-brew-gcc10
8998
;;

‎getlibs.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ for target in $targets ; do
6262

6363
## XXHASH
6464
NAME=xxHash
65-
VERSION=0.8.2
65+
VERSION=0.8.3
6666
LIBRARY="${NAME}-${VERSION}"
6767
ARCHIVE="$LIBRARY.tgz"
68-
SHA256=baee0c6afd4f03165de7a4e67988d16f0f2b257b51d0e3cb91909302a26a79c4
68+
SHA256=aae608dfe8213dfd05d909a57718ef82f30722c392344583d3f39050c7f29a80
6969
SOURCE="${SOURCES}/$LIBRARY"
7070
BUILD="${PREFIX}/build-$LIBRARY"
7171
if [ -r "${CMAKE_INSTALL_PREFIX}/include/xxhash.h" ]; then
@@ -89,10 +89,10 @@ for target in $targets ; do
8989

9090
## BOOST
9191
NAME=boost
92-
VERSION=1.86.0
92+
VERSION=1.88.0
9393
LIBRARY="${NAME}-${VERSION}"
9494
ARCHIVE="${LIBRARY}-cmake.tar.xz"
95-
SHA256=2c5ec5edcdff47ff55e27ed9560b0a0b94b07bd07ed9928b476150e16b0efc57
95+
SHA256=f48b48390380cfb94a629872346e3a81370dc498896f16019ade727ab72eb1ec
9696
SOURCE="${SOURCES}/${LIBRARY}"
9797
BUILD="${PREFIX}/build-${LIBRARY}"
9898
if [ -r "${CMAKE_INSTALL_PREFIX}/include/boost/math/distributions/arcsine.hpp" ] ; then
@@ -145,10 +145,10 @@ for target in $targets ; do
145145

146146
## Google Benchmark
147147
NAME=benchmark
148-
VERSION=1.9.1 # v1.8.2 fails with "-lrt not found" on win64, v1.8.3 is good
148+
VERSION=1.9.2 # v1.8.2 fails with "-lrt not found" on win64, v1.8.3 is good
149149
LIBRARY="${NAME}-${VERSION}"
150150
ARCHIVE="${LIBRARY}.tar.gz"
151-
SHA256=32131c08ee31eeff2c8968d7e874f3cb648034377dfc32a4c377fa8796d84981
151+
SHA256=409075176168dc46bbb81b74c1b4b6900385b5d16bfc181d678afb060d928bd3
152152
SOURCE="${SOURCES}/${LIBRARY}"
153153
BUILD="${PREFIX}/build-${LIBRARY}"
154154
if [ -r "${CMAKE_INSTALL_PREFIX}/include/benchmark/benchmark.h" ] ; then

0 commit comments

Comments
 (0)