diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-19 17:41:13 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-19 17:41:13 +0200 |
| commit | fc124778ea4e3d0d6bc35d816b367d0ed470bf0c (patch) | |
| tree | b5e694a4c6c7a73494762d7f54c9114e14c9098e /cmake | |
| parent | a4cd91c526933e87d78a4a3fec66a074616f3c32 (diff) | |
| parent | 88b6dc4db5567951f9c0d0baa6e965d44a7130b1 (diff) | |
| download | mariadb-git-fc124778ea4e3d0d6bc35d816b367d0ed470bf0c.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/build_configurations/mysql_release.cmake | 1 | ||||
| -rw-r--r-- | cmake/submodules.cmake | 12 | ||||
| -rw-r--r-- | cmake/wsrep.cmake | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index 105855a0bd1..a6eb8fad3d2 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/submodules.cmake b/cmake/submodules.cmake index 4181f4cd01e..34d1f37c956 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 -Then restart the build. -") + ${GIT_EXECUTABLE} submodule update --init +Then restart the build.${SUBMODULE_UPDATE_CONFIG_MESSAGE}") ENDIF() diff --git a/cmake/wsrep.cmake b/cmake/wsrep.cmake index 9fa127380a4..b272df51adb 100644 --- a/cmake/wsrep.cmake +++ b/cmake/wsrep.cmake @@ -26,7 +26,7 @@ ENDIF() OPTION(WITH_WSREP "WSREP replication API (to use, e.g. Galera Replication library)" ${with_wsrep_default}) # Set the patch version -SET(WSREP_PATCH_VERSION "23") +SET(WSREP_PATCH_VERSION "24") # Obtain wsrep API version FILE(STRINGS "${MySQL_SOURCE_DIR}/wsrep/wsrep_api.h" WSREP_API_VERSION |