mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-24 11:42:17 +08:00
50 lines
2.2 KiB
Diff
50 lines
2.2 KiB
Diff
|
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
|