diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-10-15 12:59:13 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-15 12:59:13 +0200 |
| commit | f62c12b405ba7ec80b8e2490856b83c6f5899211 (patch) | |
| tree | 010605c7f145da6ea6ac14b39abc4cf700d619b1 /configure.cmake | |
| parent | f947f73b2b6d2bd246b81a9038224d2a85777520 (diff) | |
| parent | f1afc003eefe0aafd3e070c7453d9e029d8445a8 (diff) | |
| download | mariadb-git-f62c12b405ba7ec80b8e2490856b83c6f5899211.tar.gz | |
Merge 10.0.14 into 10.1
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/configure.cmake b/configure.cmake index 6997a3c3478..d8b219f0e01 100644 --- a/configure.cmake +++ b/configure.cmake @@ -962,7 +962,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX) IF(WITH_ATOMIC_OPS STREQUAL "up") SET(MY_ATOMIC_MODE_DUMMY 1 CACHE BOOL "Assume single-CPU mode, no concurrency") ELSEIF(WITH_ATOMIC_OPS STREQUAL "rwlocks") - SET(MY_ATOMIC_MODE_RWLOCK 1 CACHE BOOL "Use pthread rwlocks for atomic ops") + SET(MY_ATOMIC_MODE_RWLOCKS 1 CACHE BOOL "Use pthread rwlocks for atomic ops") ELSEIF(WITH_ATOMIC_OPS STREQUAL "smp") ELSEIF(NOT WITH_ATOMIC_OPS) CHECK_CXX_SOURCE_COMPILES(" @@ -994,12 +994,12 @@ ELSE() ENDIF() ENDIF() -SET(WITH_ATOMIC_LOCKS "${WITH_ATOMIC_LOCKS}" CACHE STRING -"Implement atomic operations using pthread rwlocks or atomic CPU -instructions for multi-processor or uniprocessor +SET(WITH_ATOMIC_OPS "${WITH_ATOMIC_OPS}" CACHE STRING + "Implement atomic operations using pthread rwlocks (rwlocks); or atomic CPU +instructions for multi-processor (smp) or uniprocessor (up) configuration. By default gcc built-in sync functions are used, if available and 'smp' configuration otherwise.") -MARK_AS_ADVANCED(WITH_ATOMIC_LOCKS MY_ATOMIC_MODE_RWLOCK MY_ATOMIC_MODE_DUMMY) +MARK_AS_ADVANCED(WITH_ATOMIC_OPS MY_ATOMIC_MODE_RWLOCK MY_ATOMIC_MODE_DUMMY) IF(WITH_VALGRIND) SET(HAVE_valgrind 1) |