diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-21 14:40:52 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-21 14:40:52 +0100 |
| commit | 93ac7ae70ff000353538f732899b421a3f2ea7ce (patch) | |
| tree | 819b5ca057d80b42699de219c982b7924857c406 /cmake | |
| parent | 4932aba921755cfbc351b92c67068a5c48d3922b (diff) | |
| parent | a40de1bdeb218d66d5cc737758a4bab1b06f255d (diff) | |
| download | mariadb-git-93ac7ae70ff000353538f732899b421a3f2ea7ce.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/aws_sdk.cmake | 4 | ||||
| -rw-r--r-- | cmake/build_configurations/mysql_release.cmake | 1 | ||||
| -rw-r--r-- | cmake/readline.cmake | 2 | ||||
| -rw-r--r-- | cmake/submodules.cmake | 12 |
4 files changed, 13 insertions, 6 deletions
diff --git a/cmake/aws_sdk.cmake b/cmake/aws_sdk.cmake index 975a3fa6888..92e1e78ad3f 100644 --- a/cmake/aws_sdk.cmake +++ b/cmake/aws_sdk.cmake @@ -9,6 +9,9 @@ FUNCTION (CHECK_AWS_SDK RETVAL REASON) IF(NOT AWS_SDK_EXTERNAL_PROJECT) SKIP_AWS_SDK("AWS_SDK_EXTERNAL_PROJECT is not ON") ENDIF() + IF(NOT NOT_FOR_DISTRIBUTION) + SKIP_AWS_SDK("AWS SDK has Apache 2.0 License which is not complatible with GPLv2. Set -DNOT_FOR_DISTRIBUTION=ON if you need it") + ENDIF() # Check compiler support IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU") EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) @@ -73,6 +76,7 @@ FUNCTION(USE_AWS_SDK_LIBS) IF(NOT TARGET ${target}) MESSAGE(FATAL_ERROR "${target} is not a valid target") ENDIF() + SET(NON_DISTRIBUTABLE_WARNING "Apache 2.0" CACHE INTERNAL "") LIST(REMOVE_AT SDK_COMPONENTS 0) FOREACH(comp ${SDK_COMPONENTS}) SET_PROPERTY(GLOBAL PROPERTY AWS_SDK_LIBS ${comp} APPEND) diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index 4b399a131f5..466255ad7d1 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -86,7 +86,6 @@ IF(FEATURE_SET) ENDIF() ENDIF() -OPTION(ENABLED_LOCAL_INFILE "" ON) SET(WITH_INNODB_SNAPPY OFF CACHE STRING "") IF(WIN32) SET(INSTALL_MYSQLTESTDIR "" CACHE STRING "") diff --git a/cmake/readline.cmake b/cmake/readline.cmake index 12a8980b6a9..f7a5291135c 100644 --- a/cmake/readline.cmake +++ b/cmake/readline.cmake @@ -134,7 +134,7 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE) SET(USE_NEW_READLINE_INTERFACE 1) ELSE() IF(NOT_FOR_DISTRIBUTION) - SET(NON_DISTRIBUTABLE_WARNING 1) + SET(NON_DISTRIBUTABLE_WARNING "GPLv3" CACHE INTERNAL "") SET(USE_NEW_READLINE_INTERFACE 1) ELSE() SET(USE_NEW_READLINE_INTERFACE 0) diff --git a/cmake/submodules.cmake b/cmake/submodules.cmake index 9f04c26e8d6..c8f7b3cc400 100644 --- a/cmake/submodules.cmake +++ b/cmake/submodules.cmake @@ -10,7 +10,12 @@ IF(GIT_EXECUTABLE AND EXISTS "${CMAKE_SOURCE_DIR}/.git") WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE cmake_update_submodules RESULT_VARIABLE git_config_get_result) - IF(git_config_get_result EQUAL 128 OR cmake_update_submodules MATCHES no) + IF(cmake_update_submodules MATCHES no) + SET(update_result 0) + SET(SUBMODULE_UPDATE_CONFIG_MESSAGE +"\n\nTo update submodules automatically, set cmake.update-submodules to 'yes', or 'force' to update automatically: + ${GIT_EXECUTABLE} config cmake.update-submodules yes") + ELSEIF(git_config_get_result EQUAL 128) SET(update_result 0) ELSEIF (cmake_update_submodules MATCHES force) MESSAGE(STATUS "Updating submodules (forced)") @@ -31,7 +36,6 @@ ENDIF() IF(update_result OR NOT EXISTS ${CMAKE_SOURCE_DIR}/libmariadb/CMakeLists.txt) MESSAGE(FATAL_ERROR "No MariaDB Connector/C! Run - git submodule update --init --recursive -Then restart the build. -") + ${GIT_EXECUTABLE} submodule update --init --recursive +Then restart the build.${SUBMODULE_UPDATE_CONFIG_MESSAGE}") ENDIF() |