diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-08-06 01:36:25 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-05 10:36:25 -0700 |
| commit | f3221c0405b6f99c6eff113cb4ca8c81c3ad3a84 (patch) | |
| tree | a3f72ea4c7d994cf097077be5daa3b8be07c3b59 /ports/sqlite3 | |
| parent | 6a83b5365e8fc48c41564d319f915cbff603c99e (diff) | |
| download | vcpkg-f3221c0405b6f99c6eff113cb4ca8c81c3ad3a84.tar.gz vcpkg-f3221c0405b6f99c6eff113cb4ca8c81c3ad3a84.zip | |
[sqlite3] Namespaced targets with unofficial:: (#12516)
* [sqlite3] Namespaced targets with unofficial::
* Fix failure ports
* Update the targets name
* Update related docs
Diffstat (limited to 'ports/sqlite3')
| -rw-r--r-- | ports/sqlite3/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ports/sqlite3/CONTROL | 1 | ||||
| -rw-r--r-- | ports/sqlite3/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/sqlite3/sqlite3-config.in.cmake | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/ports/sqlite3/CMakeLists.txt b/ports/sqlite3/CMakeLists.txt index 3c1fc071c..d803fc03c 100644 --- a/ports/sqlite3/CMakeLists.txt +++ b/ports/sqlite3/CMakeLists.txt @@ -46,11 +46,11 @@ endif() install( TARGETS sqlite3 - EXPORT sqlite3 + EXPORT unofficial-sqlite3-targets RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) install(FILES sqlite3.h sqlite3ext.h DESTINATION include CONFIGURATIONS Release) -install(EXPORT sqlite3 FILE sqlite3-targets.cmake DESTINATION share/sqlite3) +install(EXPORT unofficial-sqlite3-targets NAMESPACE unofficial::sqlite3:: FILE unofficial-sqlite3-targets.cmake DESTINATION share/unofficial-sqlite3) diff --git a/ports/sqlite3/CONTROL b/ports/sqlite3/CONTROL index c48578eef..0d17c801e 100644 --- a/ports/sqlite3/CONTROL +++ b/ports/sqlite3/CONTROL @@ -1,5 +1,6 @@ Source: sqlite3 Version: 3.32.3 +Port-Version: 1 Homepage: https://sqlite.org/ Description: SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine. diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index 21d60ab9f..2e1d2fb6f 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -30,7 +30,7 @@ vcpkg_configure_cmake( )
vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets()
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT})
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
@@ -40,7 +40,7 @@ endif() configure_file(
${CMAKE_CURRENT_LIST_DIR}/sqlite3-config.in.cmake
- ${CURRENT_PACKAGES_DIR}/share/sqlite3/sqlite3-config.cmake
+ ${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-sqlite3-config.cmake
@ONLY
)
diff --git a/ports/sqlite3/sqlite3-config.in.cmake b/ports/sqlite3/sqlite3-config.in.cmake index 538342cf4..e7e26bf2c 100644 --- a/ports/sqlite3/sqlite3-config.in.cmake +++ b/ports/sqlite3/sqlite3-config.in.cmake @@ -4,4 +4,4 @@ if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32) find_dependency(Threads)
endif()
-include(${CMAKE_CURRENT_LIST_DIR}/sqlite3-targets.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/unofficial-sqlite3-targets.cmake)
|