diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-03-27 11:03:23 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-29 00:40:22 +0200 |
| commit | 3a3b3d8ba8d8f32feb7cf6c2609639635ddb53b5 (patch) | |
| tree | d3d1d04f802c7335c3f8a97fdd31440ffaac282b /storage/innobase/innodb.cmake | |
| parent | 92aafebd2a02be4c40ad4beb5b28ca6889c99cb9 (diff) | |
| download | mariadb-git-3a3b3d8ba8d8f32feb7cf6c2609639635ddb53b5.tar.gz | |
cleanup: innodb files in cmake/
moved to storage/innobase/
also removed duplicate checks from storage/innobase/CMakeLists.txt
(they're all in storage/innobase/innodb.cmake)
Diffstat (limited to 'storage/innobase/innodb.cmake')
| -rw-r--r-- | storage/innobase/innodb.cmake | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/storage/innobase/innodb.cmake b/storage/innobase/innodb.cmake index 880389edbf1..9d6ac0eb0e8 100644 --- a/storage/innobase/innodb.cmake +++ b/storage/innobase/innodb.cmake @@ -19,11 +19,11 @@ INCLUDE(CheckFunctionExists) INCLUDE(CheckCSourceCompiles) INCLUDE(CheckCSourceRuns) -INCLUDE(lz4) -INCLUDE(lzo) -INCLUDE(lzma) -INCLUDE(bzip2) -INCLUDE(snappy) +INCLUDE(lz4.cmake) +INCLUDE(lzo.cmake) +INCLUDE(lzma.cmake) +INCLUDE(bzip2.cmake) +INCLUDE(snappy.cmake) MYSQL_CHECK_LZ4() MYSQL_CHECK_LZO() @@ -240,6 +240,18 @@ IF (MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8) PROPERTIES COMPILE_FLAGS -Od) ENDIF() +# Avoid generating Hardware Capabilities due to crc32 instructions +IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386") + INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) + MY_CHECK_CXX_COMPILER_FLAG("-Wa,-nH" HAVE_WA_NH) + IF(HAVE_WA_NH) + ADD_COMPILE_FLAGS( + ut/ut0crc32.cc + COMPILE_FLAGS "-Wa,-nH" + ) + ENDIF() +ENDIF() + IF(MSVC) # Avoid "unreferenced label" warning in generated file GET_FILENAME_COMPONENT(_SRC_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) @@ -253,4 +265,3 @@ ENDIF() INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/innobase/include ${CMAKE_SOURCE_DIR}/storage/innobase/handler ${CMAKE_SOURCE_DIR}/libbinlogevents/include ) - |