File tree 3 files changed +13
-4
lines changed
3 files changed +13
-4
lines changed Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5)
3
3
set (CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} )
4
4
5
5
project (ckmame
6
- VERSION 2.0
6
+ VERSION 2.1
7
7
LANGUAGES C CXX)
8
8
set (CMAKE_CXX_STANDARD_REQUIRED ON )
9
9
set (CMAKE_CXX_STANDARD 17)
@@ -103,18 +103,27 @@ if(MSVC)
103
103
add_compile_definitions (_CRT_NONSTDC_NO_DEPRECATE)
104
104
endif (MSVC )
105
105
106
- find_program (NIHTEST nihtest)
107
106
if (NOT PYTHONBIN)
108
107
find_package (Python COMPONENTS Interpreter)
109
108
set (PYTHONBIN ${Python_EXECUTABLE} )
110
109
else ()
111
110
message ("Python set to ${PYTHONBIN} " )
112
111
endif ()
113
112
113
+ find_program (NIHTEST nihtest)
114
+ set (NIHTEST_REQUIRED_VERSION "1.5" )
115
+
114
116
if (RUN_REGRESS)
115
117
if (NOT NIHTEST OR NOT PYTHONBIN)
116
118
message (WARNING "-- nihtest or Python interpreter not found, regression testing disabled" )
117
119
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 ()
118
127
endif ()
119
128
endif ()
120
129
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ To use ckmame, you need
7
7
- optionally [ libxml2] ( http://xmlsoft.org/ ) (for M.A.M.E. -listxml and detectors)
8
8
- optionally [ libarchive] ( https://www.libarchive.org/ ) (for reading from 7z archives)
9
9
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 ) .
11
11
12
12
The basic usage is
13
13
``` sh
Original file line number Diff line number Diff line change 1
- X.X (XXXX-XX-XX )
1
+ 2.1 (2024-02-23 )
2
2
================
3
3
4
4
* Add ` --report-changes ` to show changes between last and current run.
You can’t perform that action at this time.
0 commit comments