Skip to content

Commit

Permalink
Prepare for release.
Browse files Browse the repository at this point in the history
  • Loading branch information
dillof committed Feb 23, 2024
1 parent 8019bcc commit b464b6e
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
13 changes: 11 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -103,18 +103,27 @@ 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})
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()

Expand Down
2 changes: 1 addition & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down

0 comments on commit b464b6e

Please sign in to comment.