This commit is contained in:
autoantwort 2022-10-31 21:25:38 +01:00 коммит произвёл GitHub
Родитель a17a5ca06f
Коммит 5a497469d1
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
6 изменённых файлов: 30 добавлений и 40 удалений

Просмотреть файл

@ -1,13 +0,0 @@
diff --git a/cmake/compiler-specifics.cmake b/cmake/compiler-specifics.cmake
index 2446f32..45b00ac 100644
--- a/cmake/compiler-specifics.cmake
+++ b/cmake/compiler-specifics.cmake
@@ -40,7 +40,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
set(available_default_warning_flags_release "${available_default_warning_flags_release} -Wno-error=unused-variable")
set(warnings_as_errors_flag "-Werror")
elseif(MSVC)
- set(available_default_warning_flags "/W3 /wd4018 /wd4068 /wd4101 /wd4244 /wd4250 /wd4267 /wd4373 /wd4800 /wd4996")
+ set(available_default_warning_flags "/W3 /wd4018 /wd4068 /wd4101 /wd4244 /wd4250 /wd4267 /wd4373 /wd4800 /wd4996 /wd4723")
# this has to be explained because MSVC is so cryptic:
# /W3 sets the warning level of MSVC to 3 (all warnings except informational warnings),
# /wd<code> disables the warning with the specific code,

Просмотреть файл

@ -1,15 +1,13 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ogdf/ogdf
REF 8a103cf3a7dfff87fe8b7534575604bc53c0870c
SHA512 264e8586be7a18640f253eb7b289dd99f1f2fc42c4d2304ab12f7c6aa9c5754b710642e7296038aea0cd9368d732d0106501fefed800743b403adafff7e3f0b2
REF 214105da97863e1d0a066157e5cc573b65b433a9
SHA512 8ab9f266fef224ce600cec418d5de56761714fbaa2d509ba89d55700c1d27d02a5fc93fab8eb8e10325a42c7d2fa8e251e2a18ece9a9565e215bf39672bff92d
HEAD_REF master
PATCHES fix-c4723.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DCOIN_INSTALL_LIBRARY_DIR:STRING=lib
-DCOIN_INSTALL_CMAKE_DIR:STRING=lib/cmake/OGDF
@ -17,11 +15,11 @@ vcpkg_configure_cmake(
-DOGDF_INSTALL_CMAKE_DIR:STRING=lib/cmake/OGDF
)
vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/OGDF)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OGDF)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/minisat/doc ${CURRENT_PACKAGES_DIR}/include/ogdf/lib/minisat/doc)
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/minisat/doc" "${CURRENT_PACKAGES_DIR}/include/ogdf/lib/minisat/doc")

Просмотреть файл

@ -1,7 +1,18 @@
{
"name": "ogdf",
"version-string": "2019-08-23",
"port-version": 2,
"version-date": "2022-06-30",
"description": "Open Graph Drawing Framework",
"homepage": "https://github.com/ogdf/ogdf"
"homepage": "https://github.com/ogdf/ogdf",
"license": null,
"supports": "!uwp",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

Просмотреть файл

@ -713,17 +713,6 @@ ode:arm-uwp=fail
ode:x64-uwp=fail
offscale-libetcd-cpp:arm-uwp=fail
offscale-libetcd-cpp:x64-uwp=fail
ogdf:arm64-windows = skip
ogdf:arm-uwp = skip
ogdf:x64-osx=fail
ogdf:arm64-osx=fail
ogdf:x64-uwp = skip
ogdf:x64-windows = skip
ogdf:x64-windows-static = skip
ogdf:x64-windows-static-md=skip
ogdf:x86-windows = skip
# broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18936
ogdf:x64-linux=fail
ogre:arm64-osx=fail
# Conflicts with ogre
ogre-next:arm64-windows = skip

Просмотреть файл

@ -5321,8 +5321,8 @@
"port-version": 3
},
"ogdf": {
"baseline": "2019-08-23",
"port-version": 2
"baseline": "2022-06-30",
"port-version": 0
},
"ogre": {
"baseline": "13.4.4",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "59450d8dd4543482cace9a1a59ca8f46883e85b2",
"version-date": "2022-06-30",
"port-version": 0
},
{
"git-tree": "1a3d7f1e718f35843520add2d7e102b12586e401",
"version-string": "2019-08-23",