diff options
| author | Roman Nozdrin <roman.nozdrin@mariadb.com> | 2020-06-13 19:39:22 +0000 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-06-19 21:04:18 +0200 |
| commit | 00bc504b77c6055cc92deecbcd23f436afc940c6 (patch) | |
| tree | 78ef1da52e63828680708d237536c3372bf3ca59 /storage/columnstore | |
| parent | 2e6acebedd0d929b5d18950acc68c91eb53f39a7 (diff) | |
| download | mariadb-git-00bc504b77c6055cc92deecbcd23f436afc940c6.tar.gz | |
Add an explicit server dependency for RPMs and limit builds to x86_64 and i386 only.
Diffstat (limited to 'storage/columnstore')
| -rw-r--r-- | storage/columnstore/CMakeLists.txt | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/storage/columnstore/CMakeLists.txt b/storage/columnstore/CMakeLists.txt index 58f66b73e19..443921c7260 100644 --- a/storage/columnstore/CMakeLists.txt +++ b/storage/columnstore/CMakeLists.txt @@ -4,16 +4,21 @@ if("NO" STREQUAL "${PLUGIN_COLUMNSTORE}") return() endif() -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCOLUMNSTORE_MATURITY=MariaDB_PLUGIN_MATURITY_GAMMA") -add_subdirectory(columnstore) +IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR +CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64" OR +CMAKE_SYSTEM_PROCESSOR STREQUAL "i386" OR +CMAKE_SYSTEM_PROCESSOR STREQUAL "i686") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCOLUMNSTORE_MATURITY=MariaDB_PLUGIN_MATURITY_GAMMA") + add_subdirectory(columnstore) -# Needed to bump the component changes up to the main scope -SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} PARENT_SCOPE) -IF (RPM) - SET(CPACK_RPM_columnstore-engine_USER_FILELIST ${CPACK_RPM_columnstore-engine_USER_FILELIST} PARENT_SCOPE) - SET(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES ${CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES} PARENT_SCOPE) - SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE} PARENT_SCOPE) - SET(CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE} PARENT_SCOPE) - SET(CPACK_RPM_columnstore-engine_PRE_UNINSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_PRE_UNINSTALL_SCRIPT_FILE} PARENT_SCOPE) - SET(CPACK_RPM_columnstore-engine_PACKAGE_CONFLICTS thrift PARENT_SCOPE) + # Needed to bump the component changes up to the main scope + SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} PARENT_SCOPE) + IF (RPM) + SET(CPACK_RPM_columnstore-engine_USER_FILELIST ${CPACK_RPM_columnstore-engine_USER_FILELIST} PARENT_SCOPE) + SET(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "${CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES}, MariaDB-server >= 10.5.4" PARENT_SCOPE) + SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE} PARENT_SCOPE) + SET(CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE} PARENT_SCOPE) + SET(CPACK_RPM_columnstore-engine_PRE_UNINSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_PRE_UNINSTALL_SCRIPT_FILE} PARENT_SCOPE) + SET(CPACK_RPM_columnstore-engine_PACKAGE_CONFLICTS thrift PARENT_SCOPE) + ENDIF() ENDIF() |