diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-08-12 16:39:12 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-08-12 16:39:12 +0200 |
| commit | 04eec20000fb6d59c75dec01a52f7ce11c52dde6 (patch) | |
| tree | b2ede121112399191b3e0760ea0118156548810d /sql | |
| parent | 68d72f9167bef48278299062e077ee42677d12c4 (diff) | |
| download | mariadb-git-04eec20000fb6d59c75dec01a52f7ce11c52dde6.tar.gz | |
MDEV-5706 MariaDB does not build on hurd-i386
Followup. Don't compile threadpool_unix.cc when thread pool is disabled
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/CMakeLists.txt | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 22cc9ac4be7..11951971c73 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -32,13 +32,6 @@ SET_SOURCE_FILES_PROPERTIES(${GEN_SOURCES} PROPERTIES GENERATED 1) 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) ADD_DEFINITIONS(${SSL_DEFINES}) ENDIF() @@ -97,10 +90,16 @@ SET (SQL_SOURCE ${MYSYS_LIBWRAP_SOURCE} ) -IF(WIN32) - SET(SQL_SOURCE ${SQL_SOURCE} threadpool_win.cc) -ELSE() - SET(SQL_SOURCE ${SQL_SOURCE} threadpool_unix.cc) +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) + IF(WIN32) + SET(SQL_SOURCE ${SQL_SOURCE} threadpool_win.cc) + ELSE() + SET(SQL_SOURCE ${SQL_SOURCE} threadpool_unix.cc) + ENDIF() ENDIF() MYSQL_ADD_PLUGIN(partition ha_partition.cc STORAGE_ENGINE DEFAULT STATIC_ONLY |