diff --git a/ports/yomm2/fix_install.patch b/ports/yomm2/fix_install.patch index 97d7c481db..a551ca06ad 100644 --- a/ports/yomm2/fix_install.patch +++ b/ports/yomm2/fix_install.patch @@ -1,47 +1,26 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7e8a282..f550c2d 100644 +index c50fd44..f550c2e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -15,7 +15,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) +@@ -15,7 +15,7 @@ # Find Boost dependency 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_package(Boost REQUIRED) message(STATUS "Using Boost libraries from ${Boost_INCLUDE_DIRS}") - if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") -diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in -index 7272504..6423a17 100644 ---- a/cmake/Config.cmake.in -+++ b/cmake/Config.cmake.in -@@ -1,7 +1,7 @@ - include(CMakeFindDependencyMacro) + if(NOT ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") AND (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c50fd44..f550c2d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -73,7 +73,6 @@ + COMMAND ${CMAKE_SOURCE_DIR}/dev/code2md "${readme_cpp}" "${readme_md}" + DEPENDS "${readme_cpp}") + endif() - # Tell library users about the Boost dependency --find_dependency(Boost 1.53 HINTS ${CMAKE_CURRENT_LIST_DIR}/..) -+find_dependency(Boost REQUIRED) +-add_subdirectory(docs.in) - # 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 - $ - $ -- $ - ) -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 - ) + ## Install instruction + # Create version file for cmake package diff --git a/ports/yomm2/portfile.cmake b/ports/yomm2/portfile.cmake index 46c1fc435c..2d19be85a7 100644 --- a/ports/yomm2/portfile.cmake +++ b/ports/yomm2/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jll63/yomm2 REF "v${VERSION}" - SHA512 35d869f79b278ae219d61e0ae3b01902c5df5457d2ced7bfd109cf0e75f3f7835ce3d4751c34838d134531f6483dc89b7d67d5ecab6e8af42b4b735284573db4 + SHA512 5b2c4e68df88893e0179f355da255401bc13863079a040c6b3b942c6be076263911bde51afca73e69fbb1e8bec5bc0f9d9549974bdd8ab01ea8dc571dcf8de4b HEAD_REF master PATCHES "fix_install.patch" ) @@ -12,10 +12,15 @@ if(VCPKG_LIBRARY_LINKAGE MATCHES "dynamic") set(YOMM2_SHARED ON) endif() +if(VCPKG_LIBRARY_LINKAGE MATCHES "static") + set(VCPKG_BUILD_TYPE release) # header-only +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DYOMM2_ENABLE_EXAMPLES=OFF + -DYOMM2_ENABLE_TESTS=OFF -DYOMM2_SHARED=${YOMM2_SHARED} ) vcpkg_cmake_install() diff --git a/ports/yomm2/vcpkg.json b/ports/yomm2/vcpkg.json index 09af20dc4a..ec51f8bd86 100644 --- a/ports/yomm2/vcpkg.json +++ b/ports/yomm2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "yomm2", - "version": "1.4.0", - "port-version": 1, + "version": "1.5.0", "description": "YOMM2 is an implementation of open multi-methods.", "homepage": "https://github.com/jll63/yomm2", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 44d3b10b9a..d1b7cd047a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9577,8 +9577,8 @@ "port-version": 0 }, "yomm2": { - "baseline": "1.4.0", - "port-version": 1 + "baseline": "1.5.0", + "port-version": 0 }, "yyjson": { "baseline": "0.8.0", diff --git a/versions/y-/yomm2.json b/versions/y-/yomm2.json index b520e9609a..b3fba971b2 100644 --- a/versions/y-/yomm2.json +++ b/versions/y-/yomm2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd0e4a794685da4c848998d46cf242a716dee35c", + "version": "1.5.0", + "port-version": 0 + }, { "git-tree": "7fb081bdba7637ab5c5bc26d1dfb2a80a1fd1303", "version": "1.4.0",