From 22a15e3995c3b6992a8f3c988a05ae413d32e9bd Mon Sep 17 00:00:00 2001 From: bucurb Date: Fri, 23 Jul 2021 05:44:41 +0100 Subject: [libuuid] Added cmake config and targets (#18738) * added cmake config and targets * bumped version * updated sha * renamed targets to unofficial- * updated sha * Trigger builds * PR comments * updated sha * Update the baseline version * PR comments * sha Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: Billy Robert ONeal III --- ports/libuuid/CMakeLists.txt | 28 ++++++++++++++++++++++++ ports/libuuid/CONTROL | 5 ----- ports/libuuid/portfile.cmake | 3 +++ ports/libuuid/unofficial-libuuid-config.cmake.in | 3 +++ ports/libuuid/vcpkg.json | 8 +++++++ versions/baseline.json | 4 ++-- versions/l-/libuuid.json | 5 +++++ 7 files changed, 49 insertions(+), 7 deletions(-) delete mode 100644 ports/libuuid/CONTROL create mode 100644 ports/libuuid/unofficial-libuuid-config.cmake.in create mode 100644 ports/libuuid/vcpkg.json diff --git a/ports/libuuid/CMakeLists.txt b/ports/libuuid/CMakeLists.txt index ff1edd0ef..9f4bb0605 100644 --- a/ports/libuuid/CMakeLists.txt +++ b/ports/libuuid/CMakeLists.txt @@ -29,7 +29,35 @@ endif() install( TARGETS uuid + EXPORT uuid_targets RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) + +include(CMakePackageConfigHelpers) +set(PACKAGE_CONFIG_FILE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libuuid-config.cmake") +set(INSTALL_CONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/unofficial-libuuid") + +configure_package_config_file(unofficial-libuuid-config.cmake.in + "${PACKAGE_CONFIG_FILE}" + INSTALL_DESTINATION "${INSTALL_CONFIG_DIR}" +) + +export(EXPORT uuid_targets + NAMESPACE unofficial::UUID:: + FILE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libuuid-targets.cmake" +) + +install(EXPORT uuid_targets + NAMESPACE unofficial::UUID:: + FILE unofficial-libuuid-targets.cmake + DESTINATION "${INSTALL_CONFIG_DIR}" +) + +install( + FILES + "${PACKAGE_CONFIG_FILE}" + DESTINATION + "${INSTALL_CONFIG_DIR}" +) diff --git a/ports/libuuid/CONTROL b/ports/libuuid/CONTROL deleted file mode 100644 index 5c11b9cac..000000000 --- a/ports/libuuid/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libuuid -Version: 1.0.3-7 -Homepage: https://sourceforge.net/projects/libuuid -Description: Universally unique id library -Supports: linux|osx \ No newline at end of file diff --git a/ports/libuuid/portfile.cmake b/ports/libuuid/portfile.cmake index bb03f31f3..3e29431f4 100644 --- a/ports/libuuid/portfile.cmake +++ b/ports/libuuid/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_sourceforge( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${CMAKE_CURRENT_LIST_DIR}/config.linux.h + ${CMAKE_CURRENT_LIST_DIR}/unofficial-libuuid-config.cmake.in DESTINATION ${SOURCE_PATH} ) @@ -29,6 +30,8 @@ set(includedir \$\{prefix\}/include) configure_file(${SOURCE_PATH}/uuid.pc.in ${SOURCE_PATH}/uuid.pc @ONLY) file(INSTALL ${SOURCE_PATH}/uuid.pc DESTINATION ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) file(INSTALL ${SOURCE_PATH}/uuid.pc DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/unofficial-libuuid TARGET_PATH share/unofficial-libuuid) vcpkg_fixup_pkgconfig() file(INSTALL diff --git a/ports/libuuid/unofficial-libuuid-config.cmake.in b/ports/libuuid/unofficial-libuuid-config.cmake.in new file mode 100644 index 000000000..ed4900cea --- /dev/null +++ b/ports/libuuid/unofficial-libuuid-config.cmake.in @@ -0,0 +1,3 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-libuuid-targets.cmake") diff --git a/ports/libuuid/vcpkg.json b/ports/libuuid/vcpkg.json new file mode 100644 index 000000000..0f88cf666 --- /dev/null +++ b/ports/libuuid/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libuuid", + "version": "1.0.3", + "port-version": 8, + "description": "Universally unique id library", + "homepage": "https://sourceforge.net/projects/libuuid", + "supports": "linux | osx" +} diff --git a/versions/baseline.json b/versions/baseline.json index 220ff6b5d..3a10fed8e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3701,8 +3701,8 @@ "port-version": 0 }, "libuuid": { - "baseline": "1.0.3-7", - "port-version": 0 + "baseline": "1.0.3", + "port-version": 8 }, "libuv": { "baseline": "1.41.0", diff --git a/versions/l-/libuuid.json b/versions/l-/libuuid.json index 66fb9c7fa..a927d01b3 100644 --- a/versions/l-/libuuid.json +++ b/versions/l-/libuuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4058a76786f399c80e1973a4101e8291032b3e9b", + "version": "1.0.3", + "port-version": 8 + }, { "git-tree": "1462e6294a414e76e18cd6b2679b5906254751bd", "version-string": "1.0.3-7", -- cgit v1.2.3