Commit 04eec200 authored by Sergei Golubchik's avatar Sergei Golubchik

MDEV-5706 MariaDB does not build on hurd-i386

Followup. Don't compile threadpool_unix.cc when thread pool is disabled
parent 68d72f91
...@@ -32,13 +32,6 @@ SET_SOURCE_FILES_PROPERTIES(${GEN_SOURCES} PROPERTIES GENERATED 1) ...@@ -32,13 +32,6 @@ SET_SOURCE_FILES_PROPERTIES(${GEN_SOURCES} PROPERTIES GENERATED 1)
ADD_DEFINITIONS(-DMYSQL_SERVER -DHAVE_EVENT_SCHEDULER) ADD_DEFINITIONS(-DMYSQL_SERVER -DHAVE_EVENT_SCHEDULER)
IF (CMAKE_SYSTEM_NAME MATCHES "Linux" OR
CMAKE_SYSTEM_NAME MATCHES "Windows" OR
CMAKE_SYSTEM_NAME MATCHES "SunOS" OR
HAVE_KQUEUE)
ADD_DEFINITIONS(-DHAVE_POOL_OF_THREADS)
ENDIF()
IF(SSL_DEFINES) IF(SSL_DEFINES)
ADD_DEFINITIONS(${SSL_DEFINES}) ADD_DEFINITIONS(${SSL_DEFINES})
ENDIF() ENDIF()
...@@ -97,10 +90,16 @@ SET (SQL_SOURCE ...@@ -97,10 +90,16 @@ SET (SQL_SOURCE
${MYSYS_LIBWRAP_SOURCE} ${MYSYS_LIBWRAP_SOURCE}
) )
IF(WIN32) IF (CMAKE_SYSTEM_NAME MATCHES "Linux" OR
SET(SQL_SOURCE ${SQL_SOURCE} threadpool_win.cc) CMAKE_SYSTEM_NAME MATCHES "Windows" OR
ELSE() CMAKE_SYSTEM_NAME MATCHES "SunOS" OR
SET(SQL_SOURCE ${SQL_SOURCE} threadpool_unix.cc) HAVE_KQUEUE)
ADD_DEFINITIONS(-DHAVE_POOL_OF_THREADS)
IF(WIN32)
SET(SQL_SOURCE ${SQL_SOURCE} threadpool_win.cc)
ELSE()
SET(SQL_SOURCE ${SQL_SOURCE} threadpool_unix.cc)
ENDIF()
ENDIF() ENDIF()
MYSQL_ADD_PLUGIN(partition ha_partition.cc STORAGE_ENGINE DEFAULT STATIC_ONLY MYSQL_ADD_PLUGIN(partition ha_partition.cc STORAGE_ENGINE DEFAULT STATIC_ONLY
......
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