diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2014-01-16 18:01:06 +0100 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2014-01-16 18:01:06 +0100 |
| commit | 75c2cc45dd984788cb949562c36c9c447392c05a (patch) | |
| tree | e3929f093c1934731c879a724cbb98ca09b43222 /CMakeLists.txt | |
| parent | 3d6c77bf7f19f3543605d768314af9ede4aedbe9 (diff) | |
| download | mariadb-git-75c2cc45dd984788cb949562c36c9c447392c05a.tar.gz | |
Bug#16316074 RFE: MAKE TMPDIR A BUILD-TIME CONFIGURABLE OPTION
Bug#68338 RFE: make tmpdir a build-time configurable option
Post-push fix: windows needs DEFAULT_TMPDIR as well.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0208022b6ec..9a0cae57bbf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -329,17 +329,15 @@ IF(SYSCONFDIR) SET(DEFAULT_SYSCONFDIR "${SYSCONFDIR}") ENDIF() -IF(UNIX) - SET(TMPDIR "P_tmpdir" - CACHE PATH - "PATH to MySQL TMP dir. Defaults to the P_tmpdir macro in <stdio.h>") - IF(TMPDIR STREQUAL "P_tmpdir") - # 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}\"") - ENDIF() +SET(TMPDIR "P_tmpdir" + CACHE PATH + "PATH to MySQL TMP dir. Defaults to the P_tmpdir macro in <stdio.h>") +IF(TMPDIR STREQUAL "P_tmpdir") + # 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}\"") ENDIF() # Run platform tests |