Skip to content

Commit b464b6e

Browse files
committed
Prepare for release.
1 parent 8019bcc commit b464b6e

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

CMakeLists.txt

+11-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5)
33
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
44

55
project(ckmame
6-
VERSION 2.0
6+
VERSION 2.1
77
LANGUAGES C CXX)
88
set(CMAKE_CXX_STANDARD_REQUIRED ON)
99
set(CMAKE_CXX_STANDARD 17)
@@ -103,18 +103,27 @@ if(MSVC)
103103
add_compile_definitions(_CRT_NONSTDC_NO_DEPRECATE)
104104
endif(MSVC)
105105

106-
find_program(NIHTEST nihtest)
107106
if (NOT PYTHONBIN)
108107
find_package (Python COMPONENTS Interpreter)
109108
set (PYTHONBIN ${Python_EXECUTABLE})
110109
else()
111110
message("Python set to ${PYTHONBIN}")
112111
endif()
113112

113+
find_program(NIHTEST nihtest)
114+
set(NIHTEST_REQUIRED_VERSION "1.5")
115+
114116
if(RUN_REGRESS)
115117
if (NOT NIHTEST OR NOT PYTHONBIN)
116118
message(WARNING "-- nihtest or Python interpreter not found, regression testing disabled")
117119
set(RUN_REGRESS OFF)
120+
else()
121+
execute_process(COMMAND ${NIHTEST} --version OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE NIHTEST_VERSION_RAW)
122+
string(REGEX REPLACE "[^ ]* " "" NIHTEST_VERSION ${NIHTEST_VERSION_RAW})
123+
if (${NIHTEST_VERSION} VERSION_LESS ${NIHTEST_REQUIRED_VERSION})
124+
message(WARNING "-- nihtest ${NIHTEST_VERSION} too old, at least ${NIHTEST_REQUIRED_VERSION} required, regression testing disabled")
125+
set(RUN_REGRESS OFF)
126+
endif()
118127
endif()
119128
endif()
120129

INSTALL.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ To use ckmame, you need
77
- optionally [libxml2](http://xmlsoft.org/) (for M.A.M.E. -listxml and detectors)
88
- optionally [libarchive](https://www.libarchive.org/) (for reading from 7z archives)
99

10-
For running the tests, you need to have [nihtest](https://nih.at/nihtest/) and [Python](https://python.org).
10+
For running the tests, you need to have [nihtest](https://nih.at/nihtest/) (at least version 1.5) and [Python](https://python.org).
1111

1212
The basic usage is
1313
```sh

NEWS.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
X.X (XXXX-XX-XX)
1+
2.1 (2024-02-23)
22
================
33

44
* Add `--report-changes` to show changes between last and current run.

0 commit comments

Comments
 (0)