diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2016-02-18 11:01:22 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2016-02-18 11:01:22 +0400 |
| commit | fd8e846a3b049903706267d58e6d8e61eea97df8 (patch) | |
| tree | 990da2e33322123b3c9e0b1201209140bedd53f6 | |
| parent | db5b51fb7e3360d4ebc303bd67363bc8324e86b6 (diff) | |
| download | mariadb-git-fd8e846a3b049903706267d58e6d8e61eea97df8.tar.gz | |
MDEV-9564 - added s390x to lib64 INSTALL_LIBDIR handling
Adjusted INSTALL_LIBDIR detection so that it is set to "lib64" on any 64bit
system (not only x86_64). New condition is insipired by GNUInstallDirs cmake
module.
| -rw-r--r-- | cmake/install_layout.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake index 757166b7c50..d1a261f8cef 100644 --- a/cmake/install_layout.cmake +++ b/cmake/install_layout.cmake @@ -137,7 +137,7 @@ SET(INSTALL_SCRIPTDIR_RPM "bin") SET(INSTALL_SYSCONFDIR_RPM "/etc") SET(INSTALL_SYSCONF2DIR_RPM "/etc/my.cnf.d") # -IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") +IF(CMAKE_SIZEOF_VOID_P EQUAL 8) SET(INSTALL_LIBDIR_RPM "lib64") SET(INSTALL_PLUGINDIR_RPM "lib64/mysql/plugin") ELSE() |