diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-11-10 09:28:45 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-10 09:28:45 -0800 |
| commit | 74844c75467ddd9af502df0b927cd5e7115d04aa (patch) | |
| tree | ffff3110b295e7a31000788204cd8304be3039a9 /ports/libmariadb | |
| parent | 19fe942c1338fac61b46df4823501a532c1b3d0e (diff) | |
| download | vcpkg-74844c75467ddd9af502df0b927cd5e7115d04aa.tar.gz vcpkg-74844c75467ddd9af502df0b927cd5e7115d04aa.zip | |
[libmysql/libmariadb] Export unofficial cmake targets (#14290)
* [libmysql/libmariadb] Add vcpkg-cmake-wrapper and usage
* [libmysql] Export target unofficial-libmysql
* [libmariadb] Export target unofficial-libmariadb
* Add conditions
* Remove empty folder
* [libmysql] Enable static build, generate library mysqlclient
* Update ports/libmysql/CONTROL
* [libmysql] Re-write portfile.cmake
* [vcpkg_clean_executables_in_bin] clean up the pdbs
* [libmysql] Fix tools on non-Windows
* [libmysql] Fix tools, fix wrapper
* [libmysql] Add macro libmysql_FOUND
* [vcpkg_clean_executables_in_bin] Revert changes
* [libmysql] Export unofficial-libmysql on both dynamic and static
* Update ports/libmariadb/export-cmake-targets.patch
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'ports/libmariadb')
| -rw-r--r-- | ports/libmariadb/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libmariadb/export-cmake-targets.patch | 26 | ||||
| -rw-r--r-- | ports/libmariadb/portfile.cmake | 3 |
3 files changed, 30 insertions, 1 deletions
diff --git a/ports/libmariadb/CONTROL b/ports/libmariadb/CONTROL index 39d0beff5..83669753e 100644 --- a/ports/libmariadb/CONTROL +++ b/ports/libmariadb/CONTROL @@ -1,6 +1,6 @@ Source: libmariadb
Version: 3.1.10
-Port-Version: 1
+Port-Version: 2
Homepage: https://github.com/MariaDB/mariadb-connector-c
Description: MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases
Default-Features: zlib, openssl
diff --git a/ports/libmariadb/export-cmake-targets.patch b/ports/libmariadb/export-cmake-targets.patch new file mode 100644 index 000000000..a9191ce8e --- /dev/null +++ b/ports/libmariadb/export-cmake-targets.patch @@ -0,0 +1,26 @@ +diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt +index 083a863..7bc32b4 100644 +--- a/libmariadb/CMakeLists.txt ++++ b/libmariadb/CMakeLists.txt +@@ -460,10 +460,21 @@ INSTALL(TARGETS mariadbclient + 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 DESTINATION share/unofficial-libmariadb) ++ ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake" ++[[include(CMakeFindDependencyMacro) ++find_dependency(ZLIB) ++find_dependency(OpenSSL) ++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-libmariadb-targets.cmake") ++]]) ++ ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake DESTINATION share/unofficial-libmariadb) + + IF(0) + # On Windows, install PDB diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake index fd009e92a..baa78d94e 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( disable-test-build.patch
fix-InstallPath.patch
fix-iconv.patch
+ export-cmake-targets.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -38,6 +39,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-libmariadb TARGET_PATH share/unofficial-libmariadb)
+
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
# remove debug header
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|