From ce8d712b46e6e8d08a698290a50e0e752475954b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Thu, 15 Jun 2017 10:13:19 +0300 Subject: [PATCH] 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. --- CMakeLists.txt | 2 +- VERSION.cmake => VERSION20.cmake | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename VERSION.cmake => VERSION20.cmake (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 048fa6700..45ceb1d16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") diff --git a/VERSION.cmake b/VERSION20.cmake similarity index 100% rename from VERSION.cmake rename to VERSION20.cmake