diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-01-20 01:57:58 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-01-20 01:57:58 +0100 |
| commit | 74cac79218c58e399bec261683617d66652663fe (patch) | |
| tree | 43978b455d807351ff5b1a46b27323980d365166 /mysys/CMakeLists.txt | |
| parent | 139bf5ce4c3e67c287418a3c5043b056c9a5cf4d (diff) | |
| download | mariadb-git-74cac79218c58e399bec261683617d66652663fe.tar.gz | |
- Fix rpl_checksum test. Use basename of file in error messages, not the o
nes prefixed with .\ or ./
- Add my_basename() to mysys.
- Do not compile files that are not needed on Windows (my_addr_resolve, an
d safemalloc related stuff it it is not used)
Avoids linker warnings about compilation of essentially empty files.
Diffstat (limited to 'mysys/CMakeLists.txt')
| -rw-r--r-- | mysys/CMakeLists.txt | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt index bf70b4615c1..819406b67e1 100644 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt @@ -29,11 +29,11 @@ SET(MYSYS_SOURCES array.c charset-def.c charset.c checksum.c default.c my_mkdir.c my_mmap.c my_once.c my_open.c my_pread.c my_pthread.c my_quick.c my_read.c my_redel.c my_rename.c my_seek.c my_sleep.c my_static.c my_symlink.c my_symlink2.c my_sync.c my_thr_init.c + my_basename.c my_write.c ptr_cmp.c queues.c stacktrace.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_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,8 +42,17 @@ 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(NOT HAVE_CXX_NEW) +IF(UNIX) + SET (MYSYS_SOURCES ${MYSYS_SOURCES} my_addr_resolve.c) +ENDIF() + +IF(WITH_SAFEMALLOC OR NOT HAVE_CXX_NEW) ADD_DEFINITIONS( -DUSE_MYSYS_NEW) + SET (MYSYS_SOURCES ${MYSYS_SOURCES} my_new.cc) +ENDIF() + +IF(WITH_SAFEMALLOC) + SET (MYSYS_SOURCES ${MYSYS_SOURCES} safemalloc.c) ENDIF() IF(HAVE_ALARM) |