diff options
| author | Vladislav Vaintroub <wlad@sol> | 2009-11-30 01:49:26 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@sol> | 2009-11-30 01:49:26 +0000 |
| commit | f458a4c963284fe9b9fa6af3d10dd0144813c8f4 (patch) | |
| tree | a9ea0d12503dfc16738cc769a0e6879ad6daa702 /mysys/CMakeLists.txt | |
| parent | dba1a7ccd91621432f51d4663ce450e5dc1af1ff (diff) | |
| parent | 4b28a6ce84fbcab3e819018a03c116c0939dab5e (diff) | |
| download | mariadb-git-f458a4c963284fe9b9fa6af3d10dd0144813c8f4.tar.gz | |
merge
Diffstat (limited to 'mysys/CMakeLists.txt')
| -rwxr-xr-x | mysys/CMakeLists.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt index b9ecd4bf83a..b6170170be1 100755 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2006 MySQL AB +# Copyright (C) 2006 MySQL AB, 2009 Sun Microsystems, Inc # # 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 @@ -35,7 +35,8 @@ SET(MYSYS_SOURCES array.c charset-def.c charset.c checksum.c default.c default_ rijndael.c safemalloc.c sha1.c string.c thr_alarm.c thr_lock.c thr_mutex.c thr_rwlock.c tree.c typelib.c my_vle.c base64.c my_memmem.c my_getpagesize.c lf_alloc-pin.c lf_dynarray.c lf_hash.c - my_atomic.c my_getncpus.c) + my_atomic.c my_getncpus.c + my_rdtsc.c) 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) @@ -47,6 +48,12 @@ IF(CMAKE_COMPILER_IS_GNUCC AND NOT HAVE_CXX_NEW) ADD_DEFINITIONS( -DUSE_MYSYS_NEW) ENDIF() +IF(CMAKE_C_COMPILER MATCHES SunPro) + # Inline assembly template for rdtsc + SET_SOURCE_FILE_PROPERTIES(my_rdtsc.c + PROPERTIES COMPILE_FLAGS ${CMAKE_CURRENT_SOURCE_DIR}/my_timer_cycles.il) +ENDIF() + IF(HAVE_LARGE_PAGES) SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_largepage.c) ENDIF() |