Commit 1a4998e9 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

MDEV-21303 postfixes

parent 5d1b8f41
...@@ -38,7 +38,7 @@ FUNCTION (INSTALL_DEBUG_SYMBOLS) ...@@ -38,7 +38,7 @@ FUNCTION (INSTALL_DEBUG_SYMBOLS)
ENDIF() ENDIF()
set(comp "") set(comp "")
IF((target STREQUAL "mysqld")) IF((target STREQUAL "mariadbd"))
SET(comp Server) SET(comp Server)
ENDIF() ENDIF()
......
...@@ -434,7 +434,7 @@ ADD_CUSTOM_TARGET(distclean ...@@ -434,7 +434,7 @@ ADD_CUSTOM_TARGET(distclean
) )
# Install initial database (default on windows, optional target elsewhere) # Install initial database (default on windows, optional target elsewhere)
IF(TARGET mysqld AND NOT CMAKE_CROSSCOMPILING) IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
IF(GENERATOR_IS_MULTI_CONFIG) IF(GENERATOR_IS_MULTI_CONFIG)
SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR}) SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
ENDIF() ENDIF()
...@@ -447,12 +447,12 @@ IF(TARGET mysqld AND NOT CMAKE_CROSSCOMPILING) ...@@ -447,12 +447,12 @@ IF(TARGET mysqld AND NOT CMAKE_CROSSCOMPILING)
${CONFIG_PARAM} ${CONFIG_PARAM}
-DTOP_SRCDIR="${CMAKE_SOURCE_DIR}" -DTOP_SRCDIR="${CMAKE_SOURCE_DIR}"
-DBINDIR="${CMAKE_CURRENT_BINARY_DIR}" -DBINDIR="${CMAKE_CURRENT_BINARY_DIR}"
-DMYSQLD_EXECUTABLE="$<TARGET_FILE:mysqld>" -DMYSQLD_EXECUTABLE="$<TARGET_FILE:mariadbd>"
-DCMAKE_CFG_INTDIR="${CMAKE_CFG_INTDIR}" -DCMAKE_CFG_INTDIR="${CMAKE_CFG_INTDIR}"
-P ${CMAKE_SOURCE_DIR}/cmake/create_initial_db.cmake -P ${CMAKE_SOURCE_DIR}/cmake/create_initial_db.cmake
COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/initdb.dep COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/initdb.dep
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/
DEPENDS mysqld DEPENDS mariadbd
) )
IF(WIN32) IF(WIN32)
SET(ALL_ON_WINDOWS ALL) SET(ALL_ON_WINDOWS ALL)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment