Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Specify VERSION in modern CMake

Commit
1e3ddbb49671d573fa4f9b6761c91d0835ffa0e3
Author
David Seifert ·
Committer
Martin Hořeňovský
Parents
15ad95c8dba8

Files · Download .tar.gz

Changes

 CMakeLists.txt           | 3 +--
 catch.pc.in              | 2 +-
 scripts/releaseCommon.py | 5 ++---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index babd686b..dfb1f857 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ if(NOT DEFINED PROJECT_NAME)
   set(NOT_SUBPROJECT ON)
 endif()
 
-project(Catch2)
+project(Catch2 LANGUAGES CXX VERSION 2.1.0)
 
 include(GNUInstallDirs)
 
@@ -22,7 +22,6 @@ set(CATCH_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(SELF_TEST_DIR ${CATCH_DIR}/projects/SelfTest)
 set(BENCHMARK_DIR ${CATCH_DIR}/projects/Benchmark)
 set(HEADER_DIR ${CATCH_DIR}/include)
-set(CATCH_VERSION_NUMBER 2.1.0)
 
 if(USE_WMAIN)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ENTRY:wmainCRTStartup")
diff --git a/catch.pc.in b/catch.pc.in
index 6865b426..abd0b66b 100644
--- a/catch.pc.in
+++ b/catch.pc.in
@@ -2,5 +2,5 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
 
 Name: Catch
 Description: Testing library for C++
-Version: @CATCH_VERSION_NUMBER@
+Version: @Catch2_VERSION@
 Cflags: -I${includedir}
diff --git a/scripts/releaseCommon.py b/scripts/releaseCommon.py
index f5efa7ed..a3b63906 100644
--- a/scripts/releaseCommon.py
+++ b/scripts/releaseCommon.py
@@ -128,13 +128,12 @@ def updateConanTestFile(version):
         f.write( line + "\n" )
 
 def updateCmakeFile(version):
-    cmakeParser = re.compile(r'set(CATCH_VERSION_NUMBER \d+\.\d+\.\d+)')
     with open(cmakePath, 'r') as file:
         lines = file.readlines()
     with open(cmakePath, 'w') as file:
         for line in lines:
-            if 'set(CATCH_VERSION_NUMBER ' in line:
-                file.write('set(CATCH_VERSION_NUMBER {0})\n'.format(version.getVersionString()))
+            if 'project(Catch2 LANGUAGES CXX VERSION ' in line:
+                file.write('project(Catch2 LANGUAGES CXX VERSION {0})\n'.format(version.getVersionString()))
             else:
                 file.write(line)