Add version to VERSION.cmake filename
The VERSION.cmake file now includes the major and minor versions in the filename. This will prevent merge conflicts when merging changes upstream.
This commit is contained in:
@ -16,7 +16,7 @@ endif()
|
||||
|
||||
# Set default values for cache entries and set the MaxScale version
|
||||
include(cmake/defaults.cmake)
|
||||
include(VERSION.cmake)
|
||||
include(VERSION20.cmake)
|
||||
|
||||
set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.")
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
|
||||
|
Reference in New Issue
Block a user