Skip to content

Commit

Permalink
[yomm2] Update to v1.4.0 (microsoft#33509)
Browse files Browse the repository at this point in the history
* [yomm2] Update to version 1.4.0

* [yomm2] v db
  • Loading branch information
FabienPean authored Sep 18, 2023
1 parent 744ea46 commit 0a50c96
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 10 deletions.
13 changes: 12 additions & 1 deletion ports/yomm2/fix_find_boost.patch
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,18 @@ index 7272504..6423a17 100644

# Tell library users about the Boost dependency
-find_dependency(Boost 1.53 HINTS ${CMAKE_CURRENT_LIST_DIR}/..)
+find_dependency(Boost 1.53)
+find_dependency(Boost REQUIRED)

# Add the targets file
include("${CMAKE_CURRENT_LIST_DIR}/YOMM2Targets.cmake")
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>
)
20 changes: 16 additions & 4 deletions ports/yomm2/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,17 +1,29 @@
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO jll63/yomm2
REF "v${VERSION}"
SHA512 456422f829293339d1d29eda8a00ad1bf5a2b7adcf0eb3727729b25208e1e67bff8187e21d49b64817ebb3a2274cef5504e22d612b1c68de20c8fe458daa81ba
SHA512 35d869f79b278ae219d61e0ae3b01902c5df5457d2ced7bfd109cf0e75f3f7835ce3d4751c34838d134531f6483dc89b7d67d5ecab6e8af42b4b735284573db4
HEAD_REF master
PATCHES "fix_find_boost.patch"
)

set(YOMM2_SHARED OFF)
if(VCPKG_LIBRARY_LINKAGE MATCHES "dynamic")
set(YOMM2_SHARED ON)
endif()

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS -DYOMM2_ENABLE_EXAMPLES=OFF
OPTIONS
-DYOMM2_ENABLE_EXAMPLES=OFF
-DYOMM2_SHARED=${YOMM2_SHARED}
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/YOMM2)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
if(VCPKG_LIBRARY_LINKAGE MATCHES "static") # header only library in static build
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug")
endif()

vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
6 changes: 2 additions & 4 deletions ports/yomm2/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
{
"name": "yomm2",
"version": "1.3.1",
"version": "1.4.0",
"description": "YOMM2 is an implementation of open multi-methods.",
"homepage": "https://github.com/jll63/yomm2",
"license": "BSL-1.0",
"dependencies": [
"boost-dynamic-bitset",
"boost-integer",
"boost-move",
"boost-mp11",
"boost-preprocessor",
"boost-type-traits",
{
"name": "vcpkg-cmake",
"host": true
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -9073,7 +9073,7 @@
"port-version": 0
},
"yomm2": {
"baseline": "1.3.1",
"baseline": "1.4.0",
"port-version": 0
},
"yyjson": {
Expand Down
5 changes: 5 additions & 0 deletions versions/y-/yomm2.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "eb04c5f671a8ba74f8f98bb4c1b53716336ce441",
"version": "1.4.0",
"port-version": 0
},
{
"git-tree": "9b2200dcba64aecc83b9009b7d8f1ccb383003c8",
"version": "1.3.1",
Expand Down

0 comments on commit 0a50c96

Please sign in to comment.