[yomm2] Update to 1.5.0 (#38302)

- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [x] The "supports" clause reflects platforms that may be fixed by this
new version.
- [x] Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.
- [x] Any patches that are no longer applied are deleted from the port's
directory.
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.

@jll63 I was not sure I could push on your branch so I made the separate
PR
This commit is contained in:
Fabien Péan 2024-04-23 19:55:14 +02:00 committed by GitHub
parent 518940b8e3
commit 2588f9a438
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 29 additions and 41 deletions

View File

@ -1,47 +1,26 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e8a282..f550c2d 100644 index c50fd44..f550c2e 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -15,7 +15,7 @@
# Find Boost dependency # Find Boost dependency
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
include(find_or_download_package) include(cmake/find_or_download_package.cmake)
-find_or_download_package(Boost INSTALL_WITH_YOMM) -find_or_download_package(Boost INSTALL_WITH_YOMM)
+find_package(Boost REQUIRED) +find_package(Boost REQUIRED)
message(STATUS "Using Boost libraries from ${Boost_INCLUDE_DIRS}") message(STATUS "Using Boost libraries from ${Boost_INCLUDE_DIRS}")
if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") if(NOT ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") AND (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang"))
diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7272504..6423a17 100644 index c50fd44..f550c2d 100644
--- a/cmake/Config.cmake.in --- a/CMakeLists.txt
+++ b/cmake/Config.cmake.in +++ b/CMakeLists.txt
@@ -1,7 +1,7 @@ @@ -73,7 +73,6 @@
include(CMakeFindDependencyMacro) COMMAND ${CMAKE_SOURCE_DIR}/dev/code2md "${readme_cpp}" "${readme_md}"
DEPENDS "${readme_cpp}")
endif()
# Tell library users about the Boost dependency -add_subdirectory(docs.in)
-find_dependency(Boost 1.53 HINTS ${CMAKE_CURRENT_LIST_DIR}/..)
+find_dependency(Boost REQUIRED)
# Add the targets file ## Install instruction
include("${CMAKE_CURRENT_LIST_DIR}/YOMM2Targets.cmake") # Create version file for cmake package
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7e8a282..f550c2d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,6 +29,5 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
target_include_directories(
yomm2 INTERFACE
$<BUILD_INTERFACE:${YOMM2_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>
- $<INSTALL_INTERFACE:Boost::yomm2>
)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -36,5 +36,6 @@
install(TARGETS yomm2
EXPORT YOMM2Targets
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
+ RUNTIME DESTINATION bin
)

View File

@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO jll63/yomm2 REPO jll63/yomm2
REF "v${VERSION}" REF "v${VERSION}"
SHA512 35d869f79b278ae219d61e0ae3b01902c5df5457d2ced7bfd109cf0e75f3f7835ce3d4751c34838d134531f6483dc89b7d67d5ecab6e8af42b4b735284573db4 SHA512 5b2c4e68df88893e0179f355da255401bc13863079a040c6b3b942c6be076263911bde51afca73e69fbb1e8bec5bc0f9d9549974bdd8ab01ea8dc571dcf8de4b
HEAD_REF master HEAD_REF master
PATCHES "fix_install.patch" PATCHES "fix_install.patch"
) )
@ -12,10 +12,15 @@ if(VCPKG_LIBRARY_LINKAGE MATCHES "dynamic")
set(YOMM2_SHARED ON) set(YOMM2_SHARED ON)
endif() endif()
if(VCPKG_LIBRARY_LINKAGE MATCHES "static")
set(VCPKG_BUILD_TYPE release) # header-only
endif()
vcpkg_cmake_configure( vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
OPTIONS OPTIONS
-DYOMM2_ENABLE_EXAMPLES=OFF -DYOMM2_ENABLE_EXAMPLES=OFF
-DYOMM2_ENABLE_TESTS=OFF
-DYOMM2_SHARED=${YOMM2_SHARED} -DYOMM2_SHARED=${YOMM2_SHARED}
) )
vcpkg_cmake_install() vcpkg_cmake_install()

View File

@ -1,7 +1,6 @@
{ {
"name": "yomm2", "name": "yomm2",
"version": "1.4.0", "version": "1.5.0",
"port-version": 1,
"description": "YOMM2 is an implementation of open multi-methods.", "description": "YOMM2 is an implementation of open multi-methods.",
"homepage": "https://github.com/jll63/yomm2", "homepage": "https://github.com/jll63/yomm2",
"license": "BSL-1.0", "license": "BSL-1.0",

View File

@ -9577,8 +9577,8 @@
"port-version": 0 "port-version": 0
}, },
"yomm2": { "yomm2": {
"baseline": "1.4.0", "baseline": "1.5.0",
"port-version": 1 "port-version": 0
}, },
"yyjson": { "yyjson": {
"baseline": "0.8.0", "baseline": "0.8.0",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "cd0e4a794685da4c848998d46cf242a716dee35c",
"version": "1.5.0",
"port-version": 0
},
{ {
"git-tree": "7fb081bdba7637ab5c5bc26d1dfb2a80a1fd1303", "git-tree": "7fb081bdba7637ab5c5bc26d1dfb2a80a1fd1303",
"version": "1.4.0", "version": "1.4.0",