Merge branch '2.0' into 2.1

This commit is contained in:
Markus Mäkelä
2017-06-20 10:45:02 +03:00
3 changed files with 15 additions and 1 deletions

View File

@ -16,7 +16,7 @@ endif()
# Set default values for cache entries and set the MaxScale version
include(cmake/defaults.cmake)
include(VERSION.cmake)
include(VERSION21.cmake)
include(ExternalProject)
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.")