Browse Source

MDEV-21303 postfixes

bb-10.5-MDEV-21988
Vladislav Vaintroub 6 years ago
parent
commit
1a4998e982
  1. 2
      cmake/install_macros.cmake
  2. 6
      sql/CMakeLists.txt

2
cmake/install_macros.cmake

@ -38,7 +38,7 @@ FUNCTION (INSTALL_DEBUG_SYMBOLS)
ENDIF()
set(comp "")
IF((target STREQUAL "mysqld"))
IF((target STREQUAL "mariadbd"))
SET(comp Server)
ENDIF()

6
sql/CMakeLists.txt

@ -434,7 +434,7 @@ ADD_CUSTOM_TARGET(distclean
)
# 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)
SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
ENDIF()
@ -447,12 +447,12 @@ IF(TARGET mysqld AND NOT CMAKE_CROSSCOMPILING)
${CONFIG_PARAM}
-DTOP_SRCDIR="${CMAKE_SOURCE_DIR}"
-DBINDIR="${CMAKE_CURRENT_BINARY_DIR}"
-DMYSQLD_EXECUTABLE="$<TARGET_FILE:mysqld>"
-DMYSQLD_EXECUTABLE="$<TARGET_FILE:mariadbd>"
-DCMAKE_CFG_INTDIR="${CMAKE_CFG_INTDIR}"
-P ${CMAKE_SOURCE_DIR}/cmake/create_initial_db.cmake
COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/initdb.dep
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/
DEPENDS mysqld
DEPENDS mariadbd
)
IF(WIN32)
SET(ALL_ON_WINDOWS ALL)

Loading…
Cancel
Save