Commit 49f3fb8f authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

small refactoring o innobase/CMakeLists.txt

allow to build with -DPLUGIN_INNOBASE=NO
parent 91826970
...@@ -150,14 +150,7 @@ SET(INNOBASE_SOURCES ...@@ -150,14 +150,7 @@ SET(INNOBASE_SOURCES
ut/ut0wqueue.cc ut/ut0wqueue.cc
ut/ut0timer.cc) ut/ut0timer.cc)
IF(WITH_INNODB)
# Legacy option
SET(WITH_INNOBASE_STORAGE_ENGINE TRUE)
ENDIF()
MYSQL_ADD_PLUGIN(innobase ${INNOBASE_SOURCES} STORAGE_ENGINE MYSQL_ADD_PLUGIN(innobase ${INNOBASE_SOURCES} STORAGE_ENGINE
# MODULE_ONLY
# MODULE_OUTPUT_NAME ha_innodb
DEFAULT RECOMPILE_FOR_EMBEDDED DEFAULT RECOMPILE_FOR_EMBEDDED
LINK_LIBRARIES LINK_LIBRARIES
${ZLIB_LIBRARY} ${ZLIB_LIBRARY}
...@@ -166,8 +159,8 @@ MYSQL_ADD_PLUGIN(innobase ${INNOBASE_SOURCES} STORAGE_ENGINE ...@@ -166,8 +159,8 @@ MYSQL_ADD_PLUGIN(innobase ${INNOBASE_SOURCES} STORAGE_ENGINE
${LIBSYSTEMD} ${LIBSYSTEMD}
${LINKER_SCRIPT}) ${LINKER_SCRIPT})
IF(WITH_INNOBASE_STORAGE_ENGINE) IF(NOT TARGET innobase)
ADD_DEPENDENCIES(innobase GenError) RETURN()
ENDIF() ENDIF()
# A GCC bug causes crash when compiling these files on ARM64 with -O1+ # A GCC bug causes crash when compiling these files on ARM64 with -O1+
......
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