Skip to content

Upgraded the libraries and compiler to GCC-14 #34

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
mikucionisaau merged 3 commits into from
Apr 23, 2025
Merged

Upgraded the libraries and compiler to GCC-14 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af12b5b
Upgraded the libraries and compiler to GCC-14
mikucionisaau Apr 23, 2025
7c0c8d0
Upgrade C++ standard to C++23
mikucionisaau Apr 23, 2025
1242e77
version bump
mikucionisaau Apr 23, 2025
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.23)
cmake_policy(SET CMP0048 NEW) # project() command manages VERSION variables
project(UUtils VERSION 2.0.6 HOMEPAGE_URL "https://github.com/UPPAALModelChecker/UUtils" LANGUAGES CXX C)
project(UUtils VERSION 2.0.7 HOMEPAGE_URL "https://github.com/UPPAALModelChecker/UUtils" LANGUAGES CXX C)
include(CMakePackageConfigHelpers)
include(GNUInstallDirs)
include(FetchContent)
Expand Down
4 changes: 2 additions & 2 deletions cmake/stdcpp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD 23)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
Expand All @@ -12,4 +12,4 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
add_compile_options(/W4)
endif()
endif ()
endif ()
20 changes: 20 additions & 0 deletions cmake/toolchain/i686-linux-gcc14.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# the name of the target operating system
set(CMAKE_SYSTEM_NAME Linux)

# which compilers to use for C and C++
set(CMAKE_C_COMPILER gcc-14)
set(CMAKE_C_FLAGS -m32)
set(CMAKE_CXX_COMPILER g++-14)
set(CMAKE_CXX_FLAGS -m32)
set(CMAKE_ASM_FLAGS -m32)

# where is the target environment located
set(CMAKE_FIND_ROOT_PATH "${CMAKE_PREFIX_PATH}")

# adjust the default behavior of the FIND_XXX() commands:
# search programs in the host environment
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)

# search headers and libraries in the target environment
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
17 changes: 17 additions & 0 deletions cmake/toolchain/x86_64-linux-gcc14.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# the name of the target operating system
set(CMAKE_SYSTEM_NAME Linux)

# which compilers to use for C and C++
set(CMAKE_C_COMPILER gcc-14)
set(CMAKE_CXX_COMPILER g++-14)

# where is the target environment located
set(CMAKE_FIND_ROOT_PATH "${CMAKE_PREFIX_PATH}")

# adjust the default behavior of the FIND_XXX() commands:
# search programs in the host environment
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)

# search headers and libraries in the target environment
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
9 changes: 9 additions & 0 deletions compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,18 @@ for target in $targets ; do
BUILD_SUFFIX=""
BUILD_EXTRA=""
case "$target" in
x86_64-linux-gcc14*)
BUILD_TARGET=x86_64-linux-gcc14
;;
x86_64-linux-gcc10*)
BUILD_TARGET=x86_64-linux-gcc10
;;
x86_64-linux*)
BUILD_TARGET=x86_64-linux
;;
i686-linux-gcc14*)
BUILD_TARGET=i686-linux-gcc14
;;
i686-linux-gcc10*)
BUILD_TARGET=i686-linux-gcc10
;;
Expand All @@ -84,6 +90,9 @@ for target in $targets ; do
BUILD_TARGET=i686-w64-mingw32
export WINEPATH=$("$PROJECT_DIR"/winepath-for $BUILD_TARGET)
;;
x86_64-darwin-brew-gcc14-*)
BUILD_TARGET=x86_64-darwin-brew-gcc14
;;
x86_64-darwin-brew-gcc10-*)
BUILD_TARGET=x86_64-darwin-brew-gcc10
;;
Expand Down
12 changes: 6 additions & 6 deletions getlibs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ for target in $targets ; do

## XXHASH
NAME=xxHash
VERSION=0.8.2
VERSION=0.8.3
LIBRARY="${NAME}-${VERSION}"
ARCHIVE="$LIBRARY.tgz"
SHA256=baee0c6afd4f03165de7a4e67988d16f0f2b257b51d0e3cb91909302a26a79c4
SHA256=aae608dfe8213dfd05d909a57718ef82f30722c392344583d3f39050c7f29a80
SOURCE="${SOURCES}/$LIBRARY"
BUILD="${PREFIX}/build-$LIBRARY"
if [ -r "${CMAKE_INSTALL_PREFIX}/include/xxhash.h" ]; then
Expand All @@ -89,10 +89,10 @@ for target in $targets ; do

## BOOST
NAME=boost
VERSION=1.86.0
VERSION=1.88.0
LIBRARY="${NAME}-${VERSION}"
ARCHIVE="${LIBRARY}-cmake.tar.xz"
SHA256=2c5ec5edcdff47ff55e27ed9560b0a0b94b07bd07ed9928b476150e16b0efc57
SHA256=f48b48390380cfb94a629872346e3a81370dc498896f16019ade727ab72eb1ec
SOURCE="${SOURCES}/${LIBRARY}"
BUILD="${PREFIX}/build-${LIBRARY}"
if [ -r "${CMAKE_INSTALL_PREFIX}/include/boost/math/distributions/arcsine.hpp" ] ; then
Expand Down Expand Up @@ -145,10 +145,10 @@ for target in $targets ; do

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