diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-01 08:47:55 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-01 08:47:55 +0300 |
| commit | 6749d39a954c84bc4610acf6e5337c484afcde9a (patch) | |
| tree | 0b5dd374810ca9d9ffbd1efc3aeda19ceb02f349 /cmake | |
| parent | c02d61bc11ee06b6043e6db9a15d00b9f40bce1f (diff) | |
| parent | 1b41a54fc98dab0e05523c36b53bd62d7e7f28b4 (diff) | |
| download | mariadb-git-6749d39a954c84bc4610acf6e5337c484afcde9a.tar.gz | |
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/create_initial_db.cmake.in | 4 | ||||
| -rw-r--r-- | cmake/os/Windows.cmake | 4 | ||||
| -rw-r--r-- | cmake/submodules.cmake | 5 | ||||
| -rw-r--r-- | cmake/wsrep.cmake | 2 |
4 files changed, 6 insertions, 9 deletions
diff --git a/cmake/create_initial_db.cmake.in b/cmake/create_initial_db.cmake.in index c77e28d882c..baa48847815 100644 --- a/cmake/create_initial_db.cmake.in +++ b/cmake/create_initial_db.cmake.in @@ -82,7 +82,3 @@ EXECUTE_PROCESS ( IF(NOT RESULT EQUAL 0) MESSAGE(FATAL_ERROR "Could not create initial database \n ${OUT} \n ${ERR}") ENDIF() - -EXECUTE_PROCESS ( - COMMAND "@CMAKE_COMMAND@" -E touch ${CMAKE_CURRENT_BINARY_DIR}/initdb.dep -) diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake index 22f1ff7f30d..37fd204ed72 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -139,8 +139,8 @@ IF(MSVC) ENDIF() #TODO: update the code and remove the disabled warnings - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805 /wd4996") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805 /wd4996 /wd4291 /wd4577 /we4099") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805 /wd4996 /we4700") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805 /wd4996 /wd4291 /wd4577 /we4099 /we4700") ENDIF() diff --git a/cmake/submodules.cmake b/cmake/submodules.cmake index 61eacba7c73..86e3d41eb77 100644 --- a/cmake/submodules.cmake +++ b/cmake/submodules.cmake @@ -2,8 +2,9 @@ IF(GIT_EXECUTABLE AND EXISTS "${CMAKE_SOURCE_DIR}/.git") EXECUTE_PROCESS(COMMAND "${GIT_EXECUTABLE}" config --get cmake.update-submodules WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" - OUTPUT_VARIABLE cmake_update_submodules) - IF(cmake_update_submodules MATCHES no) + OUTPUT_VARIABLE cmake_update_submodules + RESULT_VARIABLE git_config_get_result) + IF(git_config_get_result EQUAL 128 OR cmake_update_submodules MATCHES no) SET(update_result 0) ELSEIF (cmake_update_submodules MATCHES force) MESSAGE("-- Updating submodules (forced)") diff --git a/cmake/wsrep.cmake b/cmake/wsrep.cmake index be56a4c0772..e6d1379aea3 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 "19") +SET(WSREP_PATCH_VERSION "20") # Obtain wsrep API version FILE(STRINGS "${MySQL_SOURCE_DIR}/wsrep/wsrep_api.h" WSREP_API_VERSION |