8d4561c7a1
TokuDB SE has been deprecated https://jira.mariadb.org/browse/MDEV-19780 Remove the RocksDB manpage when RocksDB is not built Add failing tests
20 lines
908 B
Diff
20 lines
908 B
Diff
Use PCDIR CMake option, if configured
|
|
|
|
Upstream install the server pkgconfig file into arch-independent directory
|
|
Reported to upstream as: https://jira.mariadb.org/browse/MDEV-14340
|
|
|
|
--- mariadb-10.5.2/support-files/CMakeLists.txt 2020-04-01 01:31:21.426832942 +0200
|
|
+++ mariadb-10.5.2/support-files/CMakeLists.txt_patched 2020-04-01 01:35:05.808309914 +0200
|
|
@@ -92,7 +92,11 @@ IF(UNIX)
|
|
|
|
CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
|
|
CONFIGURE_FILE(rpm/server.cnf ${CMAKE_CURRENT_BINARY_DIR}/rpm/server.cnf @ONLY)
|
|
+IF(INSTALL_PCDIR)
|
|
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_PCDIR} COMPONENT Development)
|
|
+ELSE()
|
|
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig COMPONENT Development)
|
|
+ENDIF()
|
|
|
|
INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
|
|
|