Merge branch 'master' into vcpkg_nuget

3 files changed, 56 insertions, 38 deletions

diff --git a/ports/libmariadb/CONTROL b/ports/libmariadb/CONTROL
index 986eb5d23..267755d1b 100644
--- a/ports/libmariadb/CONTROL
+++ b/ports/libmariadb/CONTROL
@@ -1,4 +1,4 @@
 Source: libmariadb

-Version: 3.0.10-1

+Version: 3.0.10-4

 Homepage: https://github.com/MariaDB/mariadb-connector-c

 Description: MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases

diff --git a/ports/libmariadb/fix-InstallPath.patch b/ports/libmariadb/fix-InstallPath.patch
new file mode 100644
index 000000000..667a428f0
--- /dev/null
+++ b/ports/libmariadb/fix-InstallPath.patch
@@ -0,0 +1,49 @@
+diff --git a/cmake/install_plugins.cmake b/cmake/install_plugins.cmake
+index cd5616c..d058a5c 100644
+--- a/cmake/install_plugins.cmake
++++ b/cmake/install_plugins.cmake
+@@ -8,7 +8,7 @@
+ # plugin installation
+ 
+ MACRO(INSTALL_PLUGIN name binary_dir)
+-  INSTALL(TARGETS ${name} COMPONENT ClientPlugins DESTINATION ${INSTALL_PLUGINDIR})
++  INSTALL(TARGETS ${name} COMPONENT ClientPlugins DESTINATION ${INSTALL_PLUGINDIR}/../../../bin/plugin)
+   IF(WIN32)
+     FILE(APPEND ${CC_BINARY_DIR}/win/packaging/plugin.conf "<File Id=\"${name}.dll\" Name=\"${name}.dll\" DiskId=\"1\" Source=\"${binary_dir}/${CMAKE_BUILD_TYPE}/${name}.dll\"/>\n")
+     FILE(APPEND ${CC_BINARY_DIR}/win/packaging/plugin.conf "<File Id=\"${name}.pdb\" Name=\"${name}.pdb\" DiskId=\"1\" Source=\"${binary_dir}/${CMAKE_BUILD_TYPE}/${name}.pdb\"/>\n")
+diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
+index a1f039e..03a3a6f 100644
+--- a/libmariadb/CMakeLists.txt
++++ b/libmariadb/CMakeLists.txt
+@@ -386,10 +386,10 @@ ADD_LIBRARY(mariadbclient STATIC  ${MARIADB_OBJECTS} ${EMPTY_FILE})
+ TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS})
+ 
+ IF(UNIX)
+-  ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE})
++  ADD_LIBRARY(libmariadb ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE})
+   SET_TARGET_PROPERTIES(libmariadb PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
+ ELSE()
+-  ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} mariadbclient.def)
++  ADD_LIBRARY(libmariadb ${libmariadb_RC} mariadbclient.def)
+   TARGET_LINK_LIBRARIES(libmariadb  mariadbclient)
+   SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINKER_LANGUAGE C)
+ ENDIF()
+@@ -441,13 +441,14 @@ ENDIF()
+ 
+ INSTALL(TARGETS mariadbclient
+           COMPONENT Development
+-          DESTINATION ${INSTALL_LIBDIR})
++          LIBRARY DESTINATION lib)
+ INSTALL(TARGETS libmariadb
+           COMPONENT SharedLibraries
+-        DESTINATION ${INSTALL_LIBDIR})
++		  RUNTIME DESTINATION bin
++		  LIBRARY DESTINATION lib
++		  ARCHIVE DESTINATION lib)
+ 
+-
+-IF(WIN32)
++IF(0)
+    # On Windows, install PDB
+    INSTALL(FILES $<TARGET_PDB_FILE:libmariadb> DESTINATION "${INSTALL_LIBDIR}"
+            CONFIGURATIONS Debug RelWithDebInfo
diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake
index 0089ec0a3..6e74a5186 100644
--- a/ports/libmariadb/portfile.cmake
+++ b/ports/libmariadb/portfile.cmake
@@ -14,10 +14,12 @@ vcpkg_from_github(
     PATCHES

             md.patch

             disable-test-build.patch

+			fix-InstallPath.patch

 )

 

 vcpkg_configure_cmake(

     SOURCE_PATH ${SOURCE_PATH}

+    PREFER_NINJA

     OPTIONS

         -DWITH_UNITTEST=OFF

         -DWITH_SSL=OFF

@@ -31,6 +33,10 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

 endif()

 

+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)

+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)

+endif()

+

 if(VCPKG_BUILD_TYPE STREQUAL "debug")

     # move headers

     file(RENAME

@@ -38,45 +44,8 @@ if(VCPKG_BUILD_TYPE STREQUAL "debug")
         ${CURRENT_PACKAGES_DIR}/include)

 endif()

 

-# fix libmariadb lib & dll directory.

-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)

-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")

-        file(RENAME

-            ${CURRENT_PACKAGES_DIR}/lib/mariadb/mariadbclient.lib

-            ${CURRENT_PACKAGES_DIR}/lib/mariadbclient.lib)

-    endif()

-

-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")

-        file(RENAME

-            ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/mariadbclient.lib

-            ${CURRENT_PACKAGES_DIR}/debug/lib/mariadbclient.lib)

-    endif()

-else()

-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")

-        file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)

-        file(RENAME

-            ${CURRENT_PACKAGES_DIR}/lib/mariadb/libmariadb.dll

-            ${CURRENT_PACKAGES_DIR}/bin/libmariadb.dll)

-        file(RENAME

-            ${CURRENT_PACKAGES_DIR}/lib/mariadb/libmariadb.lib

-            ${CURRENT_PACKAGES_DIR}/lib/libmariadb.lib)

-    endif()

-

-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")

-        file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)

-        file(RENAME

-            ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/libmariadb.dll

-            ${CURRENT_PACKAGES_DIR}/debug/bin/libmariadb.dll)

-        file(RENAME

-            ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/libmariadb.lib

-            ${CURRENT_PACKAGES_DIR}/debug/lib/libmariadb.lib)

-    endif()

-endif()

-

 # remove plugin folder

 file(REMOVE_RECURSE

-    ${CURRENT_PACKAGES_DIR}/lib/plugin

-    ${CURRENT_PACKAGES_DIR}/debug/lib/plugin

     ${CURRENT_PACKAGES_DIR}/lib/mariadb

     ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb)