diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-10-16 03:32:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-15 12:32:58 -0700 |
| commit | 0b38206a15761344c4175a6028bdd57f96104fce (patch) | |
| tree | 00363ef0979be786c1dd3ce196e18ab2174b655c /ports/libmariadb/fix-InstallPath.patch | |
| parent | f919a1bf2beabdc1c53f2f9842eac44d72510a57 (diff) | |
| download | vcpkg-0b38206a15761344c4175a6028bdd57f96104fce.tar.gz vcpkg-0b38206a15761344c4175a6028bdd57f96104fce.zip | |
[libmariadb] Update the patch (#14059)
Diffstat (limited to 'ports/libmariadb/fix-InstallPath.patch')
| -rw-r--r-- | ports/libmariadb/fix-InstallPath.patch | 99 |
1 files changed, 50 insertions, 49 deletions
diff --git a/ports/libmariadb/fix-InstallPath.patch b/ports/libmariadb/fix-InstallPath.patch index 667a428f0..7deaf1731 100644 --- a/ports/libmariadb/fix-InstallPath.patch +++ b/ports/libmariadb/fix-InstallPath.patch @@ -1,49 +1,50 @@ -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/cmake/install_plugins.cmake b/cmake/install_plugins.cmake
+index b8d15ba..7f59db7 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(MSVC)
+ INSTALL(FILES $<TARGET_PDB_FILE:${name}> COMPONENT Debuginfo
+ DESTINATION symbols CONFIGURATIONS Debug RelWithDebInfo)
+diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
+index f406b37..a9ae9d7 100644
+--- a/libmariadb/CMakeLists.txt
++++ b/libmariadb/CMakeLists.txt
+@@ -395,10 +395,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 LINK_PRIVATE mariadbclient)
+ SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINKER_LANGUAGE C)
+ ENDIF()
+@@ -452,13 +452,14 @@ ENDIF()
+
+ INSTALL(TARGETS mariadbclient
+ COMPONENT Development
+- DESTINATION ${INSTALL_LIBDIR})
++ LIBRARY DESTINATION lib)
+ INSTALL(TARGETS libmariadb
+- COMPONENT SharedLibraries
+- DESTINATION ${INSTALL_LIBDIR})
++ COMPONENT SharedLibraries
++ RUNTIME DESTINATION bin
++ LIBRARY DESTINATION lib
++ ARCHIVE DESTINATION lib)
+
+-
+-IF(MSVC)
++IF(0)
+ # On Windows, install PDB
+ INSTALL(FILES $<TARGET_PDB_FILE:libmariadb> DESTINATION "${INSTALL_LIBDIR}"
+ CONFIGURATIONS Debug RelWithDebInfo
|