diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-08-23 15:36:38 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-23 15:36:38 +0200 |
| commit | 6c3a756dd92af851f421bd9791d4b6b95063b484 (patch) | |
| tree | 703dacbff5c8a639f3bde7cf21f0728c7332ff2d /CMakeLists.txt | |
| parent | df5aabba12844200fbb83f72e82239a106453e20 (diff) | |
| download | mariadb-git-6c3a756dd92af851f421bd9791d4b6b95063b484.tar.gz | |
MDEV-439 cmake -DWITHOUT_SERVER does not work
fix mysys/waiting_threads.c to compile w/o performance schema
include clients. scripts and manpages in -DWITHOUT_SERVER
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2599a025e27..dd4f135bf4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -298,14 +298,16 @@ ADD_SUBDIRECTORY(vio) ADD_SUBDIRECTORY(regex) ADD_SUBDIRECTORY(mysys) ADD_SUBDIRECTORY(libmysql) - +ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(extra) +ADD_SUBDIRECTORY(libservices) +ADD_SUBDIRECTORY(scripts) +ADD_SUBDIRECTORY(sql/share) +ADD_SUBDIRECTORY(support-files) + IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(tests) - ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(sql) - ADD_SUBDIRECTORY(sql/share) - ADD_SUBDIRECTORY(libservices) OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) IF(WITH_EMBEDDED_SERVER) ADD_SUBDIRECTORY(libmysqld) @@ -314,12 +316,11 @@ IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(mysql-test) ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) - ADD_SUBDIRECTORY(support-files) - ADD_SUBDIRECTORY(scripts) ADD_SUBDIRECTORY(sql-bench) - IF(UNIX) - ADD_SUBDIRECTORY(man) - ENDIF() +ENDIF() + +IF(UNIX) + ADD_SUBDIRECTORY(man) ENDIF() INCLUDE(cmake/abi_check.cmake) |