From b464b6e2f172a83c914bce9eeb724d608b021d18 Mon Sep 17 00:00:00 2001 From: Dieter Baron Date: Fri, 23 Feb 2024 09:07:39 +0100 Subject: [PATCH] Prepare for release. --- CMakeLists.txt | 13 +++++++++++-- INSTALL.md | 2 +- NEWS.md | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b3eb2347..fac5f172 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) project(ckmame - VERSION 2.0 + VERSION 2.1 LANGUAGES C CXX) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD 17) @@ -103,7 +103,6 @@ if(MSVC) add_compile_definitions(_CRT_NONSTDC_NO_DEPRECATE) endif(MSVC) -find_program(NIHTEST nihtest) if (NOT PYTHONBIN) find_package (Python COMPONENTS Interpreter) set (PYTHONBIN ${Python_EXECUTABLE}) @@ -111,10 +110,20 @@ else() message("Python set to ${PYTHONBIN}") endif() +find_program(NIHTEST nihtest) +set(NIHTEST_REQUIRED_VERSION "1.5") + if(RUN_REGRESS) if (NOT NIHTEST OR NOT PYTHONBIN) message(WARNING "-- nihtest or Python interpreter not found, regression testing disabled") set(RUN_REGRESS OFF) + else() + execute_process(COMMAND ${NIHTEST} --version OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE NIHTEST_VERSION_RAW) + string(REGEX REPLACE "[^ ]* " "" NIHTEST_VERSION ${NIHTEST_VERSION_RAW}) + if (${NIHTEST_VERSION} VERSION_LESS ${NIHTEST_REQUIRED_VERSION}) + message(WARNING "-- nihtest ${NIHTEST_VERSION} too old, at least ${NIHTEST_REQUIRED_VERSION} required, regression testing disabled") + set(RUN_REGRESS OFF) + endif() endif() endif() diff --git a/INSTALL.md b/INSTALL.md index f3b57f80..579d8ba4 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -7,7 +7,7 @@ To use ckmame, you need - optionally [libxml2](http://xmlsoft.org/) (for M.A.M.E. -listxml and detectors) - optionally [libarchive](https://www.libarchive.org/) (for reading from 7z archives) -For running the tests, you need to have [nihtest](https://nih.at/nihtest/) and [Python](https://python.org). +For running the tests, you need to have [nihtest](https://nih.at/nihtest/) (at least version 1.5) and [Python](https://python.org). The basic usage is ```sh diff --git a/NEWS.md b/NEWS.md index 225db40e..395d4912 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -X.X (XXXX-XX-XX) +2.1 (2024-02-23) ================ * Add `--report-changes` to show changes between last and current run.