UPPAALModelChecker · mikucionisaau · May 12, 2025 · Apr 23, 2025 · Apr 23, 2025 · Apr 23, 2025
diff --git a/.clang-tidy b/.clang-tidy
@@ -0,0 +1,3 @@
+---
+Checks: '-*,cppcoreguidelines-macro-usage,hicpp-deprecated-headers,modernize-deprecated-headers,hicpp-use-override,hicpp-use-emplace,modernize-use-emplace,hicpp-use-auto,readability-container-size-empty,readability-implicit-bool-conversion,readability-redundant-smartptr-get,readability-qualified-auto,performance-unnecessary-value-param,modernize-make-unique,modernize-make-shared,misc-unused-using-decls,performance-move-const-arg,modernize-use-using,modernize-use-nullptr,modernize-deprecated-headers,modernize-loop-convert,misc-unused-using-decls,misc-static-assert,misc-redundant-expression,modernize-use-bool-literals,readability-delete-null-pointer,readability-redundant-member-init'
+SystemHeaders: false
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -43,24 +43,24 @@ jobs:
           WINEPATH=$($PWD/winepath-for ${{ matrix.target }})
           echo "WINEPATH=$WINEPATH" >> $GITHUB_ENV
           echo "WINARCH=win64" >> $GITHUB_ENV
-      - name: Build without getlibs
-        run: |
-          BUILD="build-${{ matrix.target }}-${CMAKE_BUILD_TYPE,,}"
-          cmake -S . -B "$BUILD" -DUDBM_STATIC=$STATIC -DASAN=${{ matrix.sanitizers }} -DUBSAN=${{ matrix.sanitizers }} -DENABLE_DBM_NEW=${{ matrix.newdbm }}
-          cmake --build "$BUILD" --config $CMAKE_BUILD_TYPE
-          (cd "$BUILD" ; ctest -C $CMAKE_BUILD_TYPE)
+#      - name: Build without getlibs
+#        run: |
+#          BUILD="build-${{ matrix.target }}-${CMAKE_BUILD_TYPE,,}"
+#          cmake -B "$BUILD" -DUDBM_STATIC=$STATIC -DASAN=${{ matrix.sanitizers }} -DUBSAN=${{ matrix.sanitizers }} -DENABLE_DBM_NEW=${{ matrix.newdbm }}
+#          cmake --build "$BUILD" --config $CMAKE_BUILD_TYPE
+#          ctest --build "$BUILD" -C $CMAKE_BUILD_TYPE)
       - name: Getlibs
         run: ./getlibs.sh ${{ matrix.target }}
       - name: Build with getlibs
         run: |
-          BUILD="build-${{ matrix.target }}-libs-${CMAKE_BUILD_TYPE,,}"          
-          cmake -S . -B "$BUILD" -DCMAKE_PREFIX_PATH="${{ github.workspace }}/local/${{ matrix.target }}" -DUDBM_STATIC=$STATIC -DASAN=${{ matrix.sanitizers }} -DUBSAN=${{ matrix.sanitizers }} -DENABLE_DBM_NEW=${{ matrix.newdbm }}
+          BUILD="build-${{ matrix.target }}-libs-${CMAKE_BUILD_TYPE,,}"
+          cmake -B "$BUILD" -DCMAKE_PREFIX_PATH="${{ github.workspace }}/local/${{ matrix.target }}" -DUDBM_STATIC=$STATIC -DASAN=${{ matrix.sanitizers }} -DUBSAN=${{ matrix.sanitizers }} -DENABLE_DBM_NEW=${{ matrix.newdbm }}
           cmake --build "$BUILD" --config $CMAKE_BUILD_TYPE
-          (cd "$BUILD" ; ctest -C $CMAKE_BUILD_TYPE)
-  build-macos:
+          ctest --test-dir "$BUILD" -C $CMAKE_BUILD_TYPE
+  build-darwin:
     runs-on: macos-latest
     env:
-      CMAKE_TOOLCHAIN_FILE: ${{ github.workspace }}/cmake/toolchain/x86_64-darwin.cmake
+      CMAKE_TOOLCHAIN_FILE: ${{ github.workspace }}/cmake/toolchain/darwin.cmake
       CMAKE_BUILD_TYPE: Release
       CTEST_OUTPUT_ON_FAILURE: 1
       CTEST_TEST_TIMEOUT: 20
@@ -71,20 +71,20 @@ jobs:
         sanitizers: [ON, OFF]
     steps:
       - uses: actions/checkout@v3
-      - name: Build without getlibs
-        run: |
-          BUILD=build-x86_64-darwin-$CMAKE_BUILD_TYPE
-          cmake -S . -B "$BUILD" -DASAN=${{ matrix.sanitizers }} -DUBSAN=${{ matrix.sanitizers }}
-          cmake --build "$BUILD" --config $CMAKE_BUILD_TYPE
-          (cd "$BUILD" ; ctest -C $CMAKE_BUILD_TYPE)
+#      - name: Build without getlibs
+#        run: |
+#          BUILD=build-darwin-$CMAKE_BUILD_TYPE
+#          cmake -B "$BUILD" -DASAN=${{ matrix.sanitizers }} -DUBSAN=${{ matrix.sanitizers }}
+#          cmake --build "$BUILD" --config $CMAKE_BUILD_TYPE
+#          ctest --test-dir "$BUILD" -C $CMAKE_BUILD_TYPE
       - name: Get dependencies
-        run: CMAKE_BUILD_TYPE=Release ./getlibs.sh x86_64-darwin
+        run: CMAKE_BUILD_TYPE=Release ./getlibs.sh darwin
       - name: Build with getlibs
         run: |
-          BUILD=build-x86_64-darwin-libs-$CMAKE_BUILD_TYPE
-          cmake -S . -B "$BUILD" -DCMAKE_PREFIX_PATH="${{ github.workspace }}/local/x86_64-darwin" -DASAN=${{ matrix.sanitizers }} -DUBSAN=${{ matrix.sanitizers }}
+          BUILD=build-darwin-libs-$CMAKE_BUILD_TYPE
+          cmake -B "$BUILD" -DCMAKE_PREFIX_PATH="${{ github.workspace }}/local/darwin" -DASAN=${{ matrix.sanitizers }} -DUBSAN=${{ matrix.sanitizers }}
           cmake --build "$BUILD" --config $CMAKE_BUILD_TYPE
-          (cd "$BUILD" ; ctest -C $CMAKE_BUILD_TYPE)
+          ctest --test-dir "$BUILD" -C $CMAKE_BUILD_TYPE
   build-windows:
     runs-on: windows-latest
     env:
@@ -95,13 +95,12 @@ jobs:
       CTEST_TEST_TIMEOUT: 20
     steps:
       - uses: actions/checkout@v3
-      - name: Build without getlibs
-        run: |
-          $env:BUILD='build-x86_64-windows'
-          cmake -S . -B $env:BUILD
-          cmake --build $env:BUILD --config $env:CMAKE_BUILD_TYPE
-          cd $env:BUILD
-          ctest -C $env:CMAKE_BUILD_TYPE
+#      - name: Build without getlibs
+#        run: |
+#          $env:BUILD='build-x86_64-windows'
+#          cmake -B $env:BUILD
+#          cmake --build $env:BUILD --config $env:CMAKE_BUILD_TYPE
+#          ctest --test-dir $env:BUILD -C $env:CMAKE_BUILD_TYPE
       - name: Get dependencies
         run: |
           vcpkg integrate install
@@ -110,7 +109,6 @@ jobs:
       - name: Build with getlibs
         run: |
           $env:BUILD='build-x86_64-windows-libs'
-          cmake -S . -B $env:BUILD -DCMAKE_PREFIX_PATH="${{ github.workspace }}/local/x86_64-w64-mingw32"
+          cmake -B $env:BUILD -DCMAKE_PREFIX_PATH="${{ github.workspace }}/local/x86_64-w64-mingw32"
           cmake --build $env:BUILD --config $env:CMAKE_BUILD_TYPE
-          cd $env:BUILD
-          ctest -C $env:CMAKE_BUILD_TYPE
+          ctest --test-dir $env:BUILD -C $env:CMAKE_BUILD_TYPE
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,14 +1,15 @@
-cmake_minimum_required(VERSION 3.16)
-project(UDBM VERSION 2.0.14 LANGUAGES CXX C)
+cmake_minimum_required(VERSION 3.30)
+project(UDBM VERSION 2.0.15 LANGUAGES CXX C)
 include(CMakePackageConfigHelpers)
 include(GNUInstallDirs)
 
 option(UDBM_WITH_TESTS "UDBM Unit tests" ON)
 option(UDBM_STATIC "Static linking" OFF)
+option(UDBM_CLANG_TIDY "Linting with clang-tidy" ON)
 option(FIND_FATAL "Stop upon find_package errors" OFF)
 
 cmake_policy(SET CMP0048 NEW) # project() command manages VERSION variables
-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)
@@ -18,7 +19,9 @@ set(ENABLE_STORE_MINGRAPH 1)
 CONFIGURE_FILE("src/config.h.cmake" "include/dbm/config.h")
 
 include(cmake/sanitizer.cmake)
-include(cmake/clang-tidy.cmake)
+if (UDBM_CLANG_TIDY)
+  include(cmake/clang-tidy.cmake)
+endif(UDBM_CLANG_TIDY)
 if (UDBM_WITH_TESTS)
     include(cmake/doctest.cmake)
 endif (UDBM_WITH_TESTS)

diff --git a/cmake/UUtils.cmake b/cmake/UUtils.cmake
@@ -1,4 +1,8 @@
-find_package(UUtils 2.0.5 COMPONENTS base hash debug QUIET)
+set(BOOST_INCLUDE_LIBRARIES math)
+include(cmake/boost.cmake)
+include(cmake/xxhash.cmake)
+
+find_package(UUtils 2.0.7 COMPONENTS base hash debug QUIET)
 
 if (UUtils_FOUND)
   message(STATUS "Found UUtils: ${UUtils_DIR}")
@@ -13,7 +17,7 @@ else(UUtils_FOUND)
     FetchContent_Declare(
             UUtils
             GIT_REPOSITORY https://github.com/UPPAALModelChecker/UUtils.git
-            GIT_TAG v2.0.5
+            GIT_TAG v2.0.7
             GIT_SHALLOW TRUE # get only the last commit version
             GIT_PROGRESS TRUE # show progress of download
             # FIND_PACKAGE_ARGS NAMES doctest
@@ -22,7 +26,7 @@ else(UUtils_FOUND)
             USES_TERMINAL_BUILD ON
             USES_TERMINAL_INSTALL ON
     )
-    FetchContent_GetProperties(UUtils)
+    FetchContent_MakeAvailable(UUtils)
     if (uutils_POPULATED)
         message(STATUS "Found populated UUtils: ${uutils_SOURCE_DIR}")
     else (uutils_POPULATED)

diff --git a/cmake/boost.cmake b/cmake/boost.cmake
@@ -0,0 +1,58 @@
+# set BOOST_INCLUDE_LIBRARIES to include specific libraries before including this script, e.g.
+# set(BOOST_INCLUDE_LIBRARIES program_options threads)
+set(Boost_NO_SYSTEM_PATHS TRUE)
+set(Boost_USE_STATIC_LIBS    ON)  # only find static libs
+set(Boost_USE_DEBUG_LIBS     OFF) # ignore debug libs and
+set(Boost_USE_RELEASE_LIBS   ON)  # only find release libs
+set(Boost_USE_STATIC_RUNTIME ON) # Mac insists on ON for boost_program_options
+#set(BOOST_USE_MULTITHREADED ON)
+#set(Boost_DEBUG ON)
+set(Boost_VERSION 1.86.0)
+
+if (BOOST_INCLUDE_LIBRARIES)
+  find_package(Boost ${Boost_VERSION} COMPONENTS ${BOOST_INCLUDE_LIBRARIES} QUIET)
+else(BOOST_INCLUDE_LIBRARIES)
+  find_package(Boost ${Boost_VERSION} QUIET)
+endif(BOOST_INCLUDE_LIBRARIES)
+
+if (Boost_FOUND)
+  message(STATUS "Found Boost: ${Boost_DIR}")
+else(Boost_FOUND)
+  message(STATUS "Failed to find Boost (${BOOST_INCLUDE_LIBRARIES}), going to compile from source")
+  if (FIND_FATAL)
+    message(FATAL_ERROR "Failed to find Boost with CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}")
+  endif(FIND_FATAL)
+  set(BOOST_ENABLE_CMAKE ON)
+  FetchContent_Declare(
+    Boost
+    DOWNLOAD_EXTRACT_TIMESTAMP ON
+    #FIND_PACKAGE_ARGS NAMES Boost COMPONENTS ${BOOST_INCLUDE_LIBRARIES}
+    URL https://github.com/boostorg/boost/releases/download/boost-1.88.0/boost-1.88.0-cmake.tar.xz
+    URL_HASH SHA256=f48b48390380cfb94a629872346e3a81370dc498896f16019ade727ab72eb1ec
+    # GIT_REPOSITORY https://github.com/boostorg/boost.git
+    # GIT_TAG boost-${Boost_VERSION}
+    # GIT_SHALLOW TRUE # get only the last commit version
+    # GIT_PROGRESS TRUE # show progress of download
+    USES_TERMINAL_DOWNLOAD TRUE # show progress in ninja generator
+    USES_TERMINAL_CONFIGURE ON
+    USES_TERMINAL_BUILD ON
+    USES_TERMINAL_INSTALL ON
+    )
+  FetchContent_MakeAvailable(Boost)
+  if (Boost_POPULATED)
+    message(STATUS "Found populated Boost (${BOOST_INCLUDE_LIBRARIES}): ${boost_SOURCE_DIR}")
+  else (Boost_POPULATED)
+    FetchContent_MakeAvailable(Boost)
+    add_subdirectory(${boost_SOURCE_DIR} ${boost_BINARY_DIR} EXCLUDE_FROM_ALL)
+    # workaround for cmake complaint that boost is not among exports:
+    install(TARGETS boost_headers boost_math boost_assert boost_concept_check boost_config boost_core
+            boost_integer boost_lexical_cast boost_predef boost_random boost_static_assert boost_throw_exception
+            boost_preprocessor boost_type_traits boost_array boost_container boost_numeric_conversion boost_range
+            boost_dynamic_bitset boost_io boost_system boost_utility boost_intrusive boost_move boost_conversion
+            boost_mpl boost_container_hash boost_detail boost_iterator boost_optional boost_regex boost_tuple
+            boost_variant2 boost_winapi boost_smart_ptr boost_typeof boost_describe boost_mp11 boost_function_types
+            boost_fusion boost_functional boost_function boost_bind
+            EXPORT UUtilsConfig DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    message(STATUS "Got Boost (${BOOST_INCLUDE_LIBRARIES}): ${boost_SOURCE_DIR}")
+  endif(Boost_POPULATED)
+endif(Boost_FOUND)
diff --git a/cmake/clang-tidy.cmake b/cmake/clang-tidy.cmake
@@ -1,4 +1,4 @@
-find_program(CLANG_TIDY_PROGRAM clang-tidy-14 clang-tidy)
+find_program(CLANG_TIDY_PROGRAM NAMES clang-tidy-14 clang-tidy)
 if(CLANG_TIDY_PROGRAM)
     execute_process(COMMAND ${CLANG_TIDY_PROGRAM} --version OUTPUT_VARIABLE CLANG_TIDY_VERSION_STRING)
     string(REGEX MATCH "LLVM version ([0-9A-Za-z]+)\\.([0-9A-Za-z\\.]+)" TIDY_VERSION "${CLANG_TIDY_VERSION_STRING}")
@@ -10,8 +10,8 @@ if(CLANG_TIDY_PROGRAM)
     if (TIDY_MAJOR_VERSION GREATER_EQUAL 14)
         # Add good checks which produce a minimal amount of false positives
         # One or two false positives can be dealt with using // NOLINT
-        set(CLANG_TIDY_COMMAND ${CLANG_TIDY_PROGRAM} -checks=-*,cppcoreguidelines-macro-usage,hicpp-deprecated-headers,modernize-deprecated-headers,hicpp-use-override,hicpp-use-emplace,modernize-use-emplace,hicpp-use-auto,readability-container-size-empty,readability-implicit-bool-conversion,readability-redundant-smartptr-get,readability-qualified-auto,performance-unnecessary-value-param,modernize-make-unique,modernize-make-shared,misc-unused-using-decls,performance-move-const-arg,modernize-use-using,modernize-use-nullptr,modernize-deprecated-headers,modernize-loop-convert,misc-unused-using-decls,misc-static-assert,misc-redundant-expression,modernize-use-bool-literals,readability-delete-null-pointer,readability-redundant-member-init)
-        message(STATUS "Enabled clang-tidy ${TIDY_VERSION}: ${CLANG_TIDY_PROGRAM}")
+        set(CLANG_TIDY_COMMAND ${CLANG_TIDY_PROGRAM})
+        message(STATUS "Enabled clang-tidy ${TIDY_VERSION}: ${CLANG_TIDY_PROGRAM} --config-file=${CMAKE_SOURCE_DIR}/.clang-tidy")
     else()
         message(WARNING "Found clang-tidy ${TIDY_VERSION}, but >=14 is required, thus disabled.")
     endif()

diff --git a/cmake/doctest.cmake b/cmake/doctest.cmake
@@ -34,7 +34,7 @@ else(doctest_FOUND)
             USES_TERMINAL_BUILD ON
             USES_TERMINAL_INSTALL ON
     )
-    FetchContent_GetProperties(doctest)
+    FetchContent_MakeAvailable(doctest)
     if (doctest_POPULATED)
         message(STATUS "Found populated doctest: ${doctest_SOURCE_DIR}")
     else (doctest_POPULATED)

diff --git a/cmake/toolchain/darwin-brew-gcc14.cmake b/cmake/toolchain/darwin-brew-gcc14.cmake
@@ -0,0 +1,19 @@
+# the name of the target operating system
+set(CMAKE_SYSTEM_NAME Darwin)
+
+# which compilers to use for C and C++
+set(CMAKE_C_COMPILER gcc-14)
+set(CMAKE_C_FLAGS -m64)
+set(CMAKE_CXX_COMPILER g++-14)
+set(CMAKE_CXX_FLAGS -m64)
+set(CMAKE_ASM_FLAGS -m64)
+
+# here is the target environment located
+set(CMAKE_FIND_ROOT_PATH "${CMAKE_PREFIX_PATH}")
+
+# adjust the default behaviour of the FIND_XXX() commands:
+# search headers and libraries in the target environment,
+# search programs in both target and host environments
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
diff --git a/cmake/toolchain/x86_64-darwin.cmake → cmake/toolchain/darwin.cmake b/cmake/toolchain/x86_64-darwin.cmake → cmake/toolchain/darwin.cmake
diff --git a/cmake/toolchain/i686-linux-gcc14.cmake b/cmake/toolchain/i686-linux-gcc14.cmake
@@ -0,0 +1,19 @@
+# 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)
+
+# here is the target environment located
+set(CMAKE_FIND_ROOT_PATH "${CMAKE_PREFIX_PATH}")
+
+# adjust the default behaviour of the FIND_XXX() commands:
+# search headers and libraries in the target environment,
+# search programs in both target and host environments
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
diff --git a/cmake/toolchain/x86_64-linux-gcc14.cmake b/cmake/toolchain/x86_64-linux-gcc14.cmake
@@ -0,0 +1,19 @@
+# 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 -m64)
+set(CMAKE_CXX_COMPILER g++-14)
+set(CMAKE_CXX_FLAGS -m64)
+set(CMAKE_ASM_FLAGS -m64)
+
+# here is the target environment located
+set(CMAKE_FIND_ROOT_PATH "${CMAKE_PREFIX_PATH}")
+
+# adjust the default behaviour of the FIND_XXX() commands:
+# search headers and libraries in the target environment,
+# search programs in both target and host environments
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
diff --git a/cmake/xxhash.cmake b/cmake/xxhash.cmake
@@ -51,7 +51,7 @@ else(xxHash_FOUND)
     USES_TERMINAL_BUILD ON
     USES_TERMINAL_INSTALL ON
     )
-  FetchContent_GetProperties(xxHash)
+  FetchContent_MakeAvailable(xxHash)
   if (xxhash_POPULATED)
     message(STATUS "Found populated xxHash: ${xxhash_SOURCE_DIR}")
   else (xxhash_POPULATED)

diff --git a/compile.sh b/compile.sh
@@ -9,21 +9,45 @@ else
     targets="$@"
 fi
 
+function show_cmake_vars() {
+    for var in CMAKE_TOOLCHAIN_FILE CMAKE_BUILD_TYPE CMAKE_PREFIX_PATH CMAKE_INSTALL_PREFIX \
+               CMAKE_GENERATOR CMAKE_BUILD_PARALLEL_LEVEL; do
+        echo "  $var=${!var:- (unset)}"
+    done
+}
+
 for target in $targets ; do
     unset BUILD_EXTRA
     unset CMAKE_BUILD_TYPE
     case $target in
+        x86_64-linux-gcc14*)
+            PLATFORM=x86_64-linux-gcc14
+            ;;
         linux64*|x86_64-linux*)
             PLATFORM=x86_64-linux
             ;;
+        i686-linux-gcc14*)
+            PLATFORM=i686-linux-gcc14
+            ;;
         linux32*|i686-linux*)
             PLATFORM=i686-linux
             ;;
         win64*|x86_64-w64-mingw32*)
             PLATFORM=x86_64-w64-mingw32
+            export WINEPATH=$("$PROJECT_DIR"/winepath-for $PLATFORM)
             ;;
         win32*|i686-w64-mingw32*)
             PLATFORM=i686-w64-mingw32
+            export WINEPATH=$("$PROJECT_DIR"/winepath-for $PLATFORM)
+            ;;
+        darwin-brew-gcc14*)
+            PLATFORM=darwin-brew-gcc14
+            ;;
+        darwin*)
+            PLATFORM=darwin
+            ;;
+        x86_64-darwin-brew-gcc14*)
+            PLATFORM=x86_64-darwin-brew-gcc14
             ;;
         macos*|x86_64-darwin*)
             PLATFORM=x86_64-darwin
@@ -36,7 +60,7 @@ for target in $targets ; do
     BUILD_DIR="build-$PLATFORM"
 
     case $target in
-        *-lib*)
+        *-libs*)
             CMAKE_BUILD_TYPE=Release ./getlibs.sh $PLATFORM
             BUILD_EXTRA="$BUILD_EXTRA -DFIND_FATAL=ON"
             export CMAKE_PREFIX_PATH="$PROJECT_DIR/local/$PLATFORM"
@@ -76,10 +100,8 @@ for target in $targets ; do
             echo "Unrecognized build type: $target, assuming $CMAKE_BUILD_TYPE"
     esac
     echo "Building $target${BUILD_EXTRA:+ with$BUILD_EXTRA} into $BUILD_DIR"
-    echo "  CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE"
-    echo "  CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH"
-    echo "  CMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_FILE"
-    cmake -S "$PROJECT_DIR" -B "$BUILD_DIR" $BUILD_EXTRA
+    show_cmake_vars
+    cmake -S "$PROJECT_DIR" -B "$BUILD_DIR" -DUDBM_CLANG_TIDY=OFF $BUILD_EXTRA
     cmake --build "$BUILD_DIR" --config $CMAKE_BUILD_TYPE
-    (cd "$BUILD_DIR" ; ctest -C $CMAKE_BUILD_TYPE --output-on-failure)
+    ctest --test-dir "$BUILD_DIR" -C $CMAKE_BUILD_TYPE --output-on-failure
 done