diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-21 11:09:55 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-21 11:09:55 -0400 |
| commit | 086af8367ed2499adae378638225ceb14c85f046 (patch) | |
| tree | 953720d86a4decd67a24b560ffbe277900ff9609 /CMakeLists.txt | |
| parent | 558995ad84ca1348dfe681a8d111650225fcc205 (diff) | |
| parent | 1170a54060168d885cbf682836342d4fc4ccae1a (diff) | |
| download | mariadb-git-086af8367ed2499adae378638225ceb14c85f046.tar.gz | |
bzr merge -r4209 maria/10.0.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index eb6ce6c726f..393aff64faa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ -# Copyright (c) 2006, 2013, Oracle and/or its affiliates. -# Copyright (c) 2008, 2013, Monty Program Ab +# Copyright (c) 2006, 2014, Oracle and/or its affiliates. +# Copyright (c) 2008, 2014, Monty Program Ab # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -338,14 +338,15 @@ IF(INSTALL_SYSCONFDIR) SET(DEFAULT_SYSCONFDIR "${INSTALL_SYSCONFDIR}") ENDIF() -OPTION(TMPDIR -"PATH to MySQL TMP dir. If unspecified, defaults to P_tmpdir in <stdio.h>" OFF) -IF(TMPDIR) +SET(TMPDIR "" + CACHE PATH + "PATH to MySQL TMP dir. Defaults to the P_tmpdir macro in <stdio.h>") +IF(TMPDIR STREQUAL "") + # Do not quote it, to refer to the P_tmpdir macro. + SET(DEFAULT_TMPDIR "P_tmpdir") +ELSE() # Quote it, to make it a const char string. SET(DEFAULT_TMPDIR "\"${TMPDIR}\"") -ELSE() - # Do not quote it, to refer to the P_tmpdir macro in <stdio.h>. - SET(DEFAULT_TMPDIR "P_tmpdir") ENDIF() # Run platform tests @@ -394,11 +395,13 @@ IF(WITH_UNIT_TESTS) ADD_SUBDIRECTORY(unittest/examples) ADD_SUBDIRECTORY(unittest/mysys) ADD_SUBDIRECTORY(unittest/my_decimal) - ADD_SUBDIRECTORY(unittest/sql) + IF(NOT WITHOUT_SERVER) + ADD_SUBDIRECTORY(unittest/sql) + ENDIF() ENDIF() IF(NOT WITHOUT_SERVER) -SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "") + SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "") # Add storage engines and plugins. CONFIGURE_PLUGINS() ENDIF() |