mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-08 01:53:50 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[ogdf] Fix build error on Visual Studio 2019 (#13647)

Browse Source 
* [ogdf] Fix build error on Visual Studio 2019

* Update portfile.cmake

Update Format
This commit is contained in:
NancyLi1013 2020-09-28 08:34:12 +08:00 committed by GitHub
parent bfc0f48833
commit 9ab6b68c83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ports/ogdf/CONTROL
View File

@ -1,4 +1,5 @@
Source: ogdf Source: ogdf
Version: 2019-08-23 Version: 2019-08-23
Port-Version: 1
Homepage: https://github.com/ogdf/ogdf Homepage: https://github.com/ogdf/ogdf
Description: Open Graph Drawing Framework Description: Open Graph Drawing Framework

13
ports/ogdf/fix-c4723.patch Normal file
View File

@ -0,0 +1,13 @@
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,

5
ports/ogdf/portfile.cmake
View File

@ -1,11 +1,10 @@
include(vcpkg_common_functions)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO ogdf/ogdf REPO ogdf/ogdf
REF 8a103cf3a7dfff87fe8b7534575604bc53c0870c REF 8a103cf3a7dfff87fe8b7534575604bc53c0870c
SHA512 264e8586be7a18640f253eb7b289dd99f1f2fc42c4d2304ab12f7c6aa9c5754b710642e7296038aea0cd9368d732d0106501fefed800743b403adafff7e3f0b2 SHA512 264e8586be7a18640f253eb7b289dd99f1f2fc42c4d2304ab12f7c6aa9c5754b710642e7296038aea0cd9368d732d0106501fefed800743b403adafff7e3f0b2
HEAD_REF master HEAD_REF master
PATCHES fix-c4723.patch
) )
vcpkg_configure_cmake( vcpkg_configure_cmake(
@ -23,6 +22,6 @@ vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/OGDF) vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/OGDF)
# Handle copyright # Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/ogdf RENAME 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}/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(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/minisat/doc ${CURRENT_PACKAGES_DIR}/include/ogdf/lib/minisat/doc)