mirror of
				https://github.com/catchorg/Catch2.git
				synced 2025-11-04 05:59:32 +01:00 
			
		
		
		
	Have the in-development version report as v3.0.0
Because some of the tooling used by Catch2 does not properly support version postfixes, such as `preview-1`, we will report the in-development version is `v3.0.0`, and the first real release will have to be `v3.0.1`. Closes #1824
This commit is contained in:
		@@ -25,7 +25,7 @@ if (CMAKE_BINARY_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
 | 
				
			|||||||
endif()
 | 
					endif()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
project(Catch2 LANGUAGES CXX VERSION 2.10.2)
 | 
					project(Catch2 LANGUAGES CXX VERSION 3.0.0)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Provide path for scripts
 | 
					# Provide path for scripts
 | 
				
			||||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake")
 | 
					list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake")
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -37,7 +37,7 @@ namespace Catch {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    Version const& libraryVersion() {
 | 
					    Version const& libraryVersion() {
 | 
				
			||||||
        static Version version( 2, 10, 2, "", 0 );
 | 
					        static Version version( 3, 0, 0, "preview", 2 );
 | 
				
			||||||
        return version;
 | 
					        return version;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,8 +6,8 @@
 | 
				
			|||||||
#ifndef TWOBLUECUBES_CATCH_VERSION_MACROS_HPP_INCLUDED
 | 
					#ifndef TWOBLUECUBES_CATCH_VERSION_MACROS_HPP_INCLUDED
 | 
				
			||||||
#define TWOBLUECUBES_CATCH_VERSION_MACROS_HPP_INCLUDED
 | 
					#define TWOBLUECUBES_CATCH_VERSION_MACROS_HPP_INCLUDED
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CATCH_VERSION_MAJOR 2
 | 
					#define CATCH_VERSION_MAJOR 3
 | 
				
			||||||
#define CATCH_VERSION_MINOR 10
 | 
					#define CATCH_VERSION_MINOR 0
 | 
				
			||||||
#define CATCH_VERSION_PATCH 2
 | 
					#define CATCH_VERSION_PATCH 0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif // TWOBLUECUBES_CATCH_VERSION_MACROS_HPP_INCLUDED
 | 
					#endif // TWOBLUECUBES_CATCH_VERSION_MACROS_HPP_INCLUDED
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user