mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-15 12:58:03 +08:00
[yomm2] Update to v1.4.0 (#33509)
* [yomm2] Update to version 1.4.0 * [yomm2] v db
This commit is contained in:
parent
744ea46048
commit
0a50c9623b
@ -20,7 +20,18 @@ index 7272504..6423a17 100644
|
|||||||
|
|
||||||
# Tell library users about the Boost dependency
|
# Tell library users about the Boost dependency
|
||||||
-find_dependency(Boost 1.53 HINTS ${CMAKE_CURRENT_LIST_DIR}/..)
|
-find_dependency(Boost 1.53 HINTS ${CMAKE_CURRENT_LIST_DIR}/..)
|
||||||
+find_dependency(Boost 1.53)
|
+find_dependency(Boost REQUIRED)
|
||||||
|
|
||||||
# Add the targets file
|
# Add the targets file
|
||||||
include("${CMAKE_CURRENT_LIST_DIR}/YOMM2Targets.cmake")
|
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>
|
||||||
|
)
|
||||||
|
@ -1,17 +1,29 @@
|
|||||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
|
||||||
vcpkg_from_github(
|
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 456422f829293339d1d29eda8a00ad1bf5a2b7adcf0eb3727729b25208e1e67bff8187e21d49b64817ebb3a2274cef5504e22d612b1c68de20c8fe458daa81ba
|
SHA512 35d869f79b278ae219d61e0ae3b01902c5df5457d2ced7bfd109cf0e75f3f7835ce3d4751c34838d134531f6483dc89b7d67d5ecab6e8af42b4b735284573db4
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
PATCHES "fix_find_boost.patch"
|
PATCHES "fix_find_boost.patch"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
set(YOMM2_SHARED OFF)
|
||||||
|
if(VCPKG_LIBRARY_LINKAGE MATCHES "dynamic")
|
||||||
|
set(YOMM2_SHARED ON)
|
||||||
|
endif()
|
||||||
|
|
||||||
vcpkg_cmake_configure(
|
vcpkg_cmake_configure(
|
||||||
SOURCE_PATH "${SOURCE_PATH}"
|
SOURCE_PATH "${SOURCE_PATH}"
|
||||||
OPTIONS -DYOMM2_ENABLE_EXAMPLES=OFF
|
OPTIONS
|
||||||
|
-DYOMM2_ENABLE_EXAMPLES=OFF
|
||||||
|
-DYOMM2_SHARED=${YOMM2_SHARED}
|
||||||
)
|
)
|
||||||
vcpkg_cmake_install()
|
vcpkg_cmake_install()
|
||||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/YOMM2)
|
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")
|
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")
|
||||||
|
@ -1,15 +1,13 @@
|
|||||||
{
|
{
|
||||||
"name": "yomm2",
|
"name": "yomm2",
|
||||||
"version": "1.3.1",
|
"version": "1.4.0",
|
||||||
"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",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
"boost-dynamic-bitset",
|
"boost-dynamic-bitset",
|
||||||
"boost-integer",
|
"boost-mp11",
|
||||||
"boost-move",
|
|
||||||
"boost-preprocessor",
|
"boost-preprocessor",
|
||||||
"boost-type-traits",
|
|
||||||
{
|
{
|
||||||
"name": "vcpkg-cmake",
|
"name": "vcpkg-cmake",
|
||||||
"host": true
|
"host": true
|
||||||
|
@ -9073,7 +9073,7 @@
|
|||||||
"port-version": 0
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"yomm2": {
|
"yomm2": {
|
||||||
"baseline": "1.3.1",
|
"baseline": "1.4.0",
|
||||||
"port-version": 0
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"yyjson": {
|
"yyjson": {
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "eb04c5f671a8ba74f8f98bb4c1b53716336ce441",
|
||||||
|
"version": "1.4.0",
|
||||||
|
"port-version": 0
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "9b2200dcba64aecc83b9009b7d8f1ccb383003c8",
|
"git-tree": "9b2200dcba64aecc83b9009b7d8f1ccb383003c8",
|
||||||
"version": "1.3.1",
|
"version": "1.3.1",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user