diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-23 07:14:51 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-23 07:14:51 +0200 |
| commit | 73985d83014e2a484dffac135193a2f0cf715b54 (patch) | |
| tree | 7167799ebc178519babd7000c76234665a9d6030 /sql/CMakeLists.txt | |
| parent | 496532b5c54d69e012f6fc2417e97d61465588f2 (diff) | |
| parent | aade6e53d398dd287ca7e771191c9975099b4fa1 (diff) | |
| download | mariadb-git-73985d83014e2a484dffac135193a2f0cf715b54.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/CMakeLists.txt')
| -rw-r--r-- | sql/CMakeLists.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index f7c97b23e87..19fdd788207 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -399,10 +399,12 @@ IF(WIN32 AND MYSQLD_EXECUTABLE) ENDIF() MAKE_DIRECTORY(${CMAKE_CURRENT_BINARY_DIR}/data) ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/initdb.dep - COMMAND ${CMAKE_COMMAND} ${CONFIG_PARAM} -P ${CMAKE_CURRENT_BINARY_DIR}/create_initial_db.cmake - COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/initdb.dep - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/data + OUTPUT initdb.dep + COMMAND ${CMAKE_COMMAND} -E remove_directory data + COMMAND ${CMAKE_COMMAND} -E make_directory data + COMMAND ${CMAKE_COMMAND} -E chdir data ${CMAKE_COMMAND} + ${CONFIG_PARAM} -P ${CMAKE_CURRENT_BINARY_DIR}/create_initial_db.cmake + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ DEPENDS mysqld ) ADD_CUSTOM_TARGET(initial_database |