diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-03-29 21:41:05 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-04-01 14:26:06 +0000 |
| commit | a1d68faa38a0fb6600c925be567f9349cf598c86 (patch) | |
| tree | c5f3c3ad6dcaf90c6b686017f99dc443e4493fed | |
| parent | 55f4e4800bc5248921b4896f4b92b816e5e4478c (diff) | |
| download | mariadb-git-a1d68faa38a0fb6600c925be567f9349cf598c86.tar.gz | |
CMake : Move INNODB_DISALLOW_WRITES from top-level CMakeLists.txt to innodb
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | storage/innobase/innodb.cmake | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ad049446d1..3875f01e525 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -235,12 +235,6 @@ MY_CHECK_AND_SET_COMPILER_FLAG(-ggdb3 DEBUG) OPTION(ENABLED_LOCAL_INFILE "If we should should enable LOAD DATA LOCAL by default" ${IF_WIN}) -OPTION(WITH_INNODB_DISALLOW_WRITES "InnoDB freeze writes patch from Google" ${WITH_WSREP}) -IF (WITH_INNODB_DISALLOW_WRITES) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWITH_INNODB_DISALLOW_WRITES") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWITH_INNODB_DISALLOW_WRITES") -ENDIF() - # Set DBUG_OFF and other optional release-only flags for non-debug project types FOREACH(BUILD_TYPE RELEASE RELWITHDEBINFO MINSIZEREL) FOREACH(LANG C CXX) @@ -254,7 +248,7 @@ ENDFOREACH() # Add safemutex for debug configurations, except on Windows # (safemutex has never worked on Windows) -IF(NOT WIN32 AND NOT WITH_INNODB_MEMCACHED) +IF(NOT WIN32) FOREACH(LANG C CXX) SET(CMAKE_${LANG}_FLAGS_DEBUG "${CMAKE_${LANG}_FLAGS_DEBUG} -DSAFE_MUTEX") ENDFOREACH() diff --git a/storage/innobase/innodb.cmake b/storage/innobase/innodb.cmake index a7e601ddd8b..88138f6dd86 100644 --- a/storage/innobase/innodb.cmake +++ b/storage/innobase/innodb.cmake @@ -226,6 +226,12 @@ ELSE() ADD_DEFINITIONS(-DMUTEX_SYS) ENDIF() +OPTION(WITH_INNODB_DISALLOW_WRITES "InnoDB freeze writes patch from Google" ${WITH_WSREP}) +IF (WITH_INNODB_DISALLOW_WRITES) + ADD_DEFINITIONS(-DWITH_INNODB_DISALLOW_WRITES) +ENDIF() + + # Include directories under innobase INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/innobase/include ${CMAKE_SOURCE_DIR}/storage/innobase/handler) |