mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-13 07:19:03 +08:00
3492464c1c
* Update to 3.1.15 * Modernize portfile * Keep plugins * Always use vcpkg zlib instead vendored copy * Use zlib and openssl modules in pc file * Always install pc file, drop non-relocatable mariadb_config * UWP is not supported * Use schannel SSL backend on windows * Fix exported includedir and libdir * Fixup windows pc file * Disable extra static lib * Disable plugins with extra dependencies * [libmariadb] Namespace targets with unofficial:: * Update versions * Enable CI for x86-windows: no conflict with mysql * Re-enable lib mariadbclient via feature * Use openssl targets to handle multi-config * Update versions * CR request * Update versions
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
|
|
index c109a20..e1fa3f1 100644
|
|
--- a/libmariadb/CMakeLists.txt
|
|
+++ b/libmariadb/CMakeLists.txt
|
|
@@ -405,6 +405,7 @@ ELSE()
|
|
ADD_LIBRARY(libmariadb ${libmariadb_RC} ${MARIADB_OBJECTS} mariadbclient.def)
|
|
SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINKER_LANGUAGE C)
|
|
ENDIF()
|
|
+TARGET_INCLUDE_DIRECTORIES(libmariadb PUBLIC $<INSTALL_INTERFACE:include/mysql>)
|
|
|
|
TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS})
|
|
|
|
@@ -453,13 +454,30 @@ ENDIF()
|
|
|
|
INSTALL(TARGETS mariadbclient
|
|
COMPONENT Development
|
|
+ EXPORT unofficial-libmariadb-targets
|
|
LIBRARY DESTINATION lib)
|
|
INSTALL(TARGETS libmariadb
|
|
COMPONENT SharedLibraries
|
|
+ EXPORT unofficial-libmariadb-targets
|
|
RUNTIME DESTINATION bin
|
|
LIBRARY DESTINATION lib
|
|
ARCHIVE DESTINATION lib)
|
|
|
|
+install(EXPORT unofficial-libmariadb-targets
|
|
+ NAMESPACE unofficial::
|
|
+ DESTINATION share/unofficial-libmariadb
|
|
+)
|
|
+
|
|
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake.in"
|
|
+[[include(CMakeFindDependencyMacro)
|
|
+find_dependency(ZLIB)
|
|
+if("@WITH_SSL@" STREQUAL "OPENSSL")
|
|
+ find_dependency(OpenSSL)
|
|
+endif()
|
|
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-libmariadb-targets.cmake")
|
|
+]])
|
|
+configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake" @ONLY)
|
|
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake DESTINATION share/unofficial-libmariadb)
|
|
|
|
IF(0)
|
|
# On Windows, install PDB
|