diff options
| author | Daniel Black <daniel.black@au.ibm.com> | 2016-11-02 14:37:43 +1100 |
|---|---|---|
| committer | Daniel Black <daniel.black@au.ibm.com> | 2016-11-02 14:37:43 +1100 |
| commit | 58ac8dd255acc599e0140b7cdcfe0b9a2bab4035 (patch) | |
| tree | 0ae91f7943b7b76bb74378628c6fd66a0521c18d /cmake/numa.cmake | |
| parent | ab0e5031e41d0aa72dd77a6dced9eacc8be5c548 (diff) | |
| download | mariadb-git-58ac8dd255acc599e0140b7cdcfe0b9a2bab4035.tar.gz | |
MDEV-11195: Simplify enablement of NUMA in innodb/xtradb
Move common parts of {innodb,xtradb}/CmakeLists.txt to the macro.
Diffstat (limited to 'cmake/numa.cmake')
| -rw-r--r-- | cmake/numa.cmake | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cmake/numa.cmake b/cmake/numa.cmake index 996042f3262..4bace0ee7f4 100644 --- a/cmake/numa.cmake +++ b/cmake/numa.cmake @@ -27,18 +27,16 @@ MACRO (MYSQL_CHECK_NUMA) SET(CMAKE_REQUIRED_LIBRARIES ${SAVE_CMAKE_REQUIRED_LIBRARIES}) IF(HAVE_LIBNUMA) ADD_DEFINITIONS(-DHAVE_LIBNUMA=1) + SET(NUMA_LIBRARY "numa") ENDIF() - ELSE() - SET(HAVE_LIBNUMA 0) ENDIF() IF(WITH_NUMA AND NOT HAVE_LIBNUMA) # Forget it in cache, abort the build. UNSET(WITH_NUMA CACHE) + UNSET(NUMA_LIBRARY CACHE) MESSAGE(FATAL_ERROR "Could not find numa headers/libraries") ENDIF() - ELSE() - SET(HAVE_LIBNUMA 0) ENDIF() ENDMACRO() |