diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-12-15 22:08:42 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-12-15 22:08:42 +0100 |
| commit | 2573f03a05ac3d1f99f8542feff9a0ce4a63c017 (patch) | |
| tree | d547b7eb1f2add6910dee55b2754dc9e1bbdb871 /mysys/CMakeLists.txt | |
| parent | 1efdd5a572ef202f64ef43d1868b021cf8c60873 (diff) | |
| download | mariadb-git-2573f03a05ac3d1f99f8542feff9a0ce4a63c017.tar.gz | |
* remove WITH_DEBUG from CMakeLists.txt
* MYSQL_MAINTAINER_MODE and SAFEMALLOC take values ON/OFF/AUTO
(in all builds, in none, only in debug and platform dependent)
* ./configure prefers RelWithDebInfo unless the user overrides
Diffstat (limited to 'mysys/CMakeLists.txt')
| -rw-r--r-- | mysys/CMakeLists.txt | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt index ec73140a42e..3b42e20c78c 100644 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt @@ -33,7 +33,7 @@ SET(MYSYS_SOURCES array.c charset-def.c charset.c checksum.c default.c rijndael.c sha1.c string.c thr_alarm.c thr_lock.c thr_mutex.c thr_rwlock.c tree.c typelib.c base64.c my_memmem.c my_getpagesize.c lf_alloc-pin.c lf_dynarray.c lf_hash.c - my_addr_resolve.c safemalloc.c + my_addr_resolve.c safemalloc.c my_new.cc my_atomic.c my_getncpus.c my_safehash.c my_chmod.c my_rnd.c my_uuid.c wqueue.c waiting_threads.c ma_dyncol.c my_rdtsc.c) @@ -42,24 +42,12 @@ IF (WIN32) SET (MYSYS_SOURCES ${MYSYS_SOURCES} my_winthread.c my_wincond.c my_winerr.c my_winfile.c my_windac.c my_conio.c) ENDIF() -IF(HAVE_ALARM) - SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_alarm.c) -ENDIF() - -IF(WIN32) - SET(DEFAULT_SAFEMALLOC OFF) -ELSE() - SET(DEFAULT_SAFEMALLOC ON) -ENDIF() -OPTION(WITH_SAFEMALLOC "Use safemalloc for debug builds. Will result in slower execution." ${DEFAULT_SAFEMALLOC}) - -IF(WITH_SAFEMALLOC) - ADD_DEFINITIONS( -DSAFEMALLOC) +IF(NOT HAVE_CXX_NEW) + ADD_DEFINITIONS( -DUSE_MYSYS_NEW) ENDIF() -IF(NOT HAVE_CXX_NEW OR WITH_SAFEMALLOC) - SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_new.cc) - ADD_DEFINITIONS( -DUSE_MYSYS_NEW) +IF(HAVE_ALARM) + SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_alarm.c) ENDIF() IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_C_COMPILER_ID MATCHES "SunPro") |