[yomm2 ] Bump yomm2 to 1.3.1 (#30028)

Co-authored-by: Ben Southall <bensouthall@smartr.ai>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
stellarpower 2023-04-19 19:09:00 +00:00 committed by GitHub
parent 6d40153f50
commit 28dc8b9b2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 32 deletions

View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7b88b1..02297e7 100644
index 7e8a282..f550c2d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ project(YOMM2 VERSION 1.0)
@@ -15,7 +15,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
# Find Boost dependency
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
include(find_or_download_package)
@ -12,7 +12,7 @@ index b7b88b1..02297e7 100644
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..9f8b2ae 100644
index 7272504..6423a17 100644
--- a/cmake/Config.cmake.in
+++ b/cmake/Config.cmake.in
@@ -1,7 +1,7 @@

View File

@ -1,22 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f16eb6..a46c8b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,14 +15,15 @@ find_package(Boost)
message(STATUS "Using Boost libraries from ${Boost_INCLUDE_DIRS}")
if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -save-temps")
endif()
endif()
if(MSVC)
- set(CMAKE_CXX_FLAGS "/std:c++17 -D_SCL_SECURE_NO_WARNINGS /EHsc")
+ set(CMAKE_CXX_FLAGS "/std:c++17 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS /EHsc")
+else()
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
endif()
add_subdirectory(src)

View File

@ -2,10 +2,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO jll63/yomm2
REF v1.1.2
SHA512 f45c3f3d267dedaa3c76f9dab1a75be01941e3715e71b30b878be49157a5ba97f2188c9e635272be3ca396019b161bb21a30199ca504c94a18673685f5dbf06d
REF "v${VERSION}"
SHA512 456422f829293339d1d29eda8a00ad1bf5a2b7adcf0eb3727729b25208e1e67bff8187e21d49b64817ebb3a2274cef5504e22d612b1c68de20c8fe458daa81ba
HEAD_REF master
PATCHES "fix_find_boost.patch" "fix_uwp_osx.patch"
PATCHES "fix_find_boost.patch"
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"

View File

@ -1,9 +1,9 @@
{
"name": "yomm2",
"version": "1.1.2",
"port-version": 2,
"version": "1.3.1",
"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",

View File

@ -8697,8 +8697,8 @@
"port-version": 0
},
"yomm2": {
"baseline": "1.1.2",
"port-version": 2
"baseline": "1.3.1",
"port-version": 0
},
"yyjson": {
"baseline": "0.6.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9b2200dcba64aecc83b9009b7d8f1ccb383003c8",
"version": "1.3.1",
"port-version": 0
},
{
"git-tree": "8bd8a2b21272e70a16c55b55215a7b5f6bd295d3",
"version": "1.1.2",