diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-10-28 15:50:13 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-10-28 15:50:13 -0400 |
| commit | 5db2195a35c0a2ee7703ab603721b2f0987d2585 (patch) | |
| tree | 1306ce565f0f01f56dd31b2c43b1233bcb08257c /cmake | |
| parent | c9ded859a6fad25fc513d3a0c7d17f826e567691 (diff) | |
| parent | eca8c324e9a02f530853580991b11b587f54b24a (diff) | |
| download | mariadb-git-5db2195a35c0a2ee7703ab603721b2f0987d2585.tar.gz | |
Merge tag 'mariadb-10.0.28' into 10.0-galera
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/cpack_rpm.cmake | 3 | ||||
| -rw-r--r-- | cmake/package_name.cmake | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index 174548502d8..00f21c1cd8b 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -221,6 +221,9 @@ SETA(CPACK_RPM_test_PACKAGE_PROVIDES "perl(mtr_io.pl)" "perl(mtr_match)" "perl(mtr_misc.pl)" + "perl(mtr_gcov.pl)" + "perl(mtr_gprof.pl)" + "perl(mtr_process.pl)" "perl(mtr_report)" "perl(mtr_results)" "perl(mtr_unique)") diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake index 87db39d68d4..30f5199441f 100644 --- a/cmake/package_name.cmake +++ b/cmake/package_name.cmake @@ -30,6 +30,10 @@ IF(NOT VERSION) SET(64BIT 1) ENDIF() + IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64") + SET(DEFAULT_MACHINE "mips") + ENDIF() + IF(CMAKE_SYSTEM_NAME MATCHES "Windows") SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0) SET(DEFAULT_PLATFORM "win") |