Commit ca350330 authored by Sergei Golubchik's avatar Sergei Golubchik

MDEV-6562 MDEV-6410 breaks WITHOUT_SERVER build

merge the fix
parents 0c148e41 fd4a4b8f
...@@ -466,7 +466,10 @@ ENDIF() ...@@ -466,7 +466,10 @@ ENDIF()
ADD_SUBDIRECTORY(packaging/solaris) ADD_SUBDIRECTORY(packaging/solaris)
IF(NOT CMAKE_CROSSCOMPILING) IF(NOT CMAKE_CROSSCOMPILING)
SET(EXPORTED comp_err comp_sql factorial gen_lex_hash) SET(EXPORTED comp_err comp_sql factorial)
IF(NOT WITHOUT_SERVER)
SET(EXPORTED ${EXPORTED} gen_lex_hash)
ENDIF()
# minimal target to build only binaries for export # minimal target to build only binaries for export
ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED}) ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED})
EXPORT(TARGETS ${EXPORTED} FILE ${CMAKE_BINARY_DIR}/import_executables.cmake) EXPORT(TARGETS ${EXPORTED} FILE ${CMAKE_BINARY_DIR}/import_executables.cmake)
......
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