blob: 586f2afc022d6e3d1e194f35b180fc34f70ea602 [file] [log] [blame]
diff -Naur mariadb-connector-c-3.1.7-src-orig/cmake/install.cmake mariadb-connector-c-3.1.7-src/cmake/install.cmake
--- mariadb-connector-c-3.1.7-src-orig/cmake/install.cmake 2020-01-22 13:08:18.000000000 +0300
+++ mariadb-connector-c-3.1.7-src/cmake/install.cmake 2020-04-21 15:43:58.718730500 +0300
@@ -61,10 +61,10 @@
#
SET(INSTALL_BINDIR_DEFAULT "bin")
-SET(INSTALL_LIBDIR_DEFAULT "lib/mariadb")
+SET(INSTALL_LIBDIR_DEFAULT "lib")
SET(INSTALL_PCDIR_DEFAULT "lib/pkgconfig")
SET(INSTALL_INCLUDEDIR_DEFAULT "include/mariadb")
-SET(INSTALL_DOCDIR_DEFAULT "docs")
+SET(INSTALL_DOCDIR_DEFAULT "share/docs/mariadb")
IF(NOT IS_SUBPROJECT)
SET(INSTALL_PLUGINDIR_DEFAULT "lib/mariadb/plugin")
ELSE()
diff -Naur mariadb-connector-c-3.1.7-src-orig/CMakeLists.txt mariadb-connector-c-3.1.7-src/CMakeLists.txt
--- mariadb-connector-c-3.1.7-src-orig/CMakeLists.txt 2020-01-22 13:08:18.000000000 +0300
+++ mariadb-connector-c-3.1.7-src/CMakeLists.txt 2020-04-21 15:43:58.718730500 +0300
@@ -392,7 +392,7 @@
INCLUDE(${CC_SOURCE_DIR}/plugins/CMakeLists.txt)
ADD_SUBDIRECTORY(include)
ADD_SUBDIRECTORY(libmariadb)
-IF(NOT WIN32)
+IF(NOT MSVC)
ADD_SUBDIRECTORY(mariadb_config)
ENDIF()
diff -Naur mariadb-connector-c-3.1.7-src-orig/libmariadb/CMakeLists.txt mariadb-connector-c-3.1.7-src/libmariadb/CMakeLists.txt
--- mariadb-connector-c-3.1.7-src-orig/libmariadb/CMakeLists.txt 2020-01-22 13:08:18.000000000 +0300
+++ mariadb-connector-c-3.1.7-src/libmariadb/CMakeLists.txt 2020-04-21 15:43:58.718730500 +0300
@@ -451,6 +451,13 @@
${CPACK_PACKAGE_VERSION_MAJOR}
SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
+IF(MINGW)
+ SET_TARGET_PROPERTIES(libmariadb PROPERTIES
+ OUTPUT_NAME mariadb
+ RUNTIME_OUTPUT_NAME libmariadb
+ ARCHIVE_OUTPUT_NAME mariadb)
+ENDIF()
+
IF(NOT WIN32)
SET_TARGET_PROPERTIES(mariadbclient PROPERTIES OUTPUT_NAME "${LIBMARIADB_STATIC_NAME}")
ENDIF()
@@ -460,7 +467,9 @@
DESTINATION ${INSTALL_LIBDIR})
INSTALL(TARGETS libmariadb
COMPONENT SharedLibraries
- DESTINATION ${INSTALL_LIBDIR})
+ RUNTIME DESTINATION ${INSTALL_BINDIR}
+ LIBRARY DESTINATION ${INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${INSTALL_LIBDIR})
IF(MSVC)