Skip to content

Commit 65fbb73

Browse files
Upgraded library dependencies and enabed warnings (#27)
- [x] removed `rangeset.h` - [x] fixed Boost library dependencies - [x] Upgraded Boost to 1.86 - [x] Upgraded GoogleBenchmark to 1.9.0 - [x] Enabled compiler warnings
2 parents 3237aa3 + 8173ecc commit 65fbb73

File tree

6 files changed

+23
-598
lines changed

6 files changed

+23
-598
lines changed

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.15)
22
cmake_policy(SET CMP0048 NEW) # project() command manages VERSION variables
3-
project(UUtils VERSION 2.0.5 HOMEPAGE_URL "https://github.com/UPPAALModelChecker/UUtils" LANGUAGES CXX C)
3+
project(UUtils VERSION 2.0.6 HOMEPAGE_URL "https://github.com/UPPAALModelChecker/UUtils" LANGUAGES CXX C)
44
include(CMakePackageConfigHelpers)
55
include(GNUInstallDirs)
66
include(FetchContent)

cmake/boost.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set(Boost_USE_RELEASE_LIBS ON) # only find release libs
77
set(Boost_USE_STATIC_RUNTIME ON) # Mac insists on ON for boost_program_options
88
#set(BOOST_USE_MULTITHREADED ON)
99
#set(Boost_DEBUG ON)
10-
set(Boost_VERSION 1.83.0)
10+
set(Boost_VERSION 1.86.0)
1111

1212
if (BOOST_INCLUDE_LIBRARIES)
1313
find_package(Boost ${Boost_VERSION} COMPONENTS ${BOOST_INCLUDE_LIBRARIES} QUIET PATHS /usr)

cmake/stdcpp.cmake

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,13 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
33
set(CMAKE_CXX_EXTENSIONS OFF)
44
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
55
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
6+
7+
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
8+
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
9+
add_compile_options(-Wpedantic -Wall -Wextra -Wno-unused-parameter)
10+
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
11+
add_compile_options(-Wpedantic -Wall -Wextra)
12+
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
13+
add_compile_options(/W4)
14+
endif()
15+
endif ()

getlibs.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,19 @@ for target in $targets ; do
6363

6464
## BOOST
6565
NAME=boost
66-
VERSION=1.83.0
66+
VERSION=1.86.0
6767
LIBRARY="${NAME}-${VERSION}"
68-
ARCHIVE="$LIBRARY.tar.xz"
69-
SHA256=c5a0688e1f0c05f354bbd0b32244d36085d9ffc9f932e8a18983a9908096f614
70-
SOURCE="${SOURCES}/$LIBRARY"
71-
BUILD="${PREFIX}/build-$LIBRARY"
68+
ARCHIVE="${LIBRARY}-cmake.tar.xz"
69+
SHA256=2c5ec5edcdff47ff55e27ed9560b0a0b94b07bd07ed9928b476150e16b0efc57
70+
SOURCE="${SOURCES}/${LIBRARY}"
71+
BUILD="${PREFIX}/build-${LIBRARY}"
7272
if [ -r "${CMAKE_INSTALL_PREFIX}/include/boost/math/distributions/arcsine.hpp" ] ; then
7373
echo "$LIBRARY is already installed in $CMAKE_INSTALL_PREFIX"
7474
else
7575
pushd "$SOURCES"
76-
[ -r "${ARCHIVE}" ] || curl -sL "https://github.com/boostorg/boost/releases/download/$LIBRARY/$LIBRARY.tar.xz" -o "${ARCHIVE}"
76+
[ -r "$ARCHIVE" ] || curl -sL "https://github.com/boostorg/boost/releases/download/${LIBRARY}/${LIBRARY}-cmake.tar.xz" -o "$ARCHIVE"
7777
if [ -n "$(command -v sha256sum)" ]; then echo "$SHA256 $ARCHIVE" | sha256sum --check ; fi
78-
[ -d "${SOURCE}" ] || tar xf "${ARCHIVE}"
78+
[ -d "$SOURCE" ] || tar xf "$ARCHIVE"
7979
popd
8080
echo "Building $LIBRARY in $BUILD from $SOURCE"
8181
echo " CMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE:-(unset)}"
@@ -122,10 +122,10 @@ for target in $targets ; do
122122

123123
## Google Benchmark
124124
NAME=benchmark
125-
VERSION=1.8.3 # v1.8.2 fails with "-lrt not found" on win64
125+
VERSION=1.9.0 # v1.8.2 fails with "-lrt not found" on win64
126126
LIBRARY="${NAME}-${VERSION}"
127127
ARCHIVE="${LIBRARY}.tar.gz"
128-
SHA256=6bc180a57d23d4d9515519f92b0c83d61b05b5bab188961f36ac7b06b0d9e9ce
128+
SHA256=35a77f46cc782b16fac8d3b107fbfbb37dcd645f7c28eee19f3b8e0758b48994
129129
SOURCE="${SOURCES}/${LIBRARY}"
130130
BUILD="${PREFIX}/build-${LIBRARY}"
131131
if [ -r "${CMAKE_INSTALL_PREFIX}/include/benchmark/benchmark.h" ] ; then

0 commit comments

Comments
 (0)