diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-17 11:00:51 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-17 11:00:51 +0100 |
| commit | 84651126c0f101ea762eec0eb4045f533a00e96d (patch) | |
| tree | 1bba1d0079b08cb10fe69e03942cd5f254dc735e /CMakeLists.txt | |
| parent | 1fa5183241e5a8e8e91690f0c35d676e9f3334ca (diff) | |
| parent | f7c8dd6bc7bb6d46d1ae2b6fdb47227429387e33 (diff) | |
| download | mariadb-git-84651126c0f101ea762eec0eb4045f533a00e96d.tar.gz | |
MySQL-5.5.36 merge
(without few incorrect bugfixes and with 1250 files where only a copyright year was changed)
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c24eeefe5a3..f7035c54a08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -328,8 +328,15 @@ SET(PLUGINDIR "${DEFAULT_MYSQL_HOME}/${INSTALL_PLUGINDIR}") 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(DEFAULT_TMPDIR "${TMPDIR}") + # 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 @@ -407,6 +414,7 @@ IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(internal) ENDIF() ADD_SUBDIRECTORY(packaging/rpm-uln) + ADD_SUBDIRECTORY(packaging/rpm-oel) ENDIF() IF(UNIX) |