diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-12 18:12:16 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-15 13:02:21 +0100 |
| commit | daa4a2c7ee5d249747d905780830aa4c0e7c4d50 (patch) | |
| tree | 8f8754b9eaeef61ad58290b700435a55cf65f7a8 | |
| parent | 5a0f2f5ea80b63d937d48b00141c5fa92d6db9f2 (diff) | |
| download | mariadb-git-daa4a2c7ee5d249747d905780830aa4c0e7c4d50.tar.gz | |
MDEV-9351 Fix CPU detection for TokuDB on FreeBSD
"x86_64" is "amd64" on FreeBSD
| -rw-r--r-- | storage/tokudb/CMakeLists.txt | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt index 1b256ff100b..aa08120267d 100644 --- a/storage/tokudb/CMakeLists.txt +++ b/storage/tokudb/CMakeLists.txt @@ -1,18 +1,15 @@ SET(TOKUDB_VERSION 5.6.26-74.0) # PerconaFT only supports x86-64 and cmake-2.8.9+ -IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND - NOT CMAKE_VERSION VERSION_LESS "2.8.9") +IF(CMAKE_VERSION VERSION_LESS "2.8.9") + MESSAGE(STATUS "CMake 2.8.9 or higher is required by TokuDB") +ELSEIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR + CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64") CHECK_CXX_SOURCE_COMPILES( " struct a {int b; int c; }; struct a d = { .b=1, .c=2 }; int main() { return 0; } " TOKUDB_OK) -ELSE() - IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND - CMAKE_VERSION VERSION_LESS "2.8.9") - MESSAGE(STATUS "CMake 2.8.9 or higher is required by TokuDB") - ENDIF() ENDIF() IF(NOT TOKUDB_OK OR WITHOUT_TOKUDB OR WITHOUT_TOKUDB_STORAGE_ENGINE) |