diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-09-28 08:34:12 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-27 17:34:12 -0700 |
| commit | 9ab6b68c83c6ec5675a5668138f28112ae65663c (patch) | |
| tree | c9acd5304c8946f59920e8b2e020a99dada20a38 | |
| parent | bfc0f488335725763b5e966641cbec738aa7a485 (diff) | |
| download | vcpkg-9ab6b68c83c6ec5675a5668138f28112ae65663c.tar.gz vcpkg-9ab6b68c83c6ec5675a5668138f28112ae65663c.zip | |
[ogdf] Fix build error on Visual Studio 2019 (#13647)
* [ogdf] Fix build error on Visual Studio 2019
* Update portfile.cmake
Update Format
| -rw-r--r-- | ports/ogdf/CONTROL | 1 | ||||
| -rw-r--r-- | ports/ogdf/fix-c4723.patch | 13 | ||||
| -rw-r--r-- | ports/ogdf/portfile.cmake | 13 |
3 files changed, 20 insertions, 7 deletions
diff --git a/ports/ogdf/CONTROL b/ports/ogdf/CONTROL index f13c58507..f7f7909f1 100644 --- a/ports/ogdf/CONTROL +++ b/ports/ogdf/CONTROL @@ -1,4 +1,5 @@ Source: ogdf Version: 2019-08-23 +Port-Version: 1 Homepage: https://github.com/ogdf/ogdf Description: Open Graph Drawing Framework diff --git a/ports/ogdf/fix-c4723.patch b/ports/ogdf/fix-c4723.patch new file mode 100644 index 000000000..14401c7a9 --- /dev/null +++ b/ports/ogdf/fix-c4723.patch @@ -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,
diff --git a/ports/ogdf/portfile.cmake b/ports/ogdf/portfile.cmake index b74295b35..45951698a 100644 --- a/ports/ogdf/portfile.cmake +++ b/ports/ogdf/portfile.cmake @@ -1,11 +1,10 @@ -include(vcpkg_common_functions) - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ogdf/ogdf - REF 8a103cf3a7dfff87fe8b7534575604bc53c0870c - SHA512 264e8586be7a18640f253eb7b289dd99f1f2fc42c4d2304ab12f7c6aa9c5754b710642e7296038aea0cd9368d732d0106501fefed800743b403adafff7e3f0b2 + OUT_SOURCE_PATH SOURCE_PATH + REPO ogdf/ogdf + REF 8a103cf3a7dfff87fe8b7534575604bc53c0870c + SHA512 264e8586be7a18640f253eb7b289dd99f1f2fc42c4d2304ab12f7c6aa9c5754b710642e7296038aea0cd9368d732d0106501fefed800743b403adafff7e3f0b2 HEAD_REF master + PATCHES fix-c4723.patch ) vcpkg_configure_cmake( @@ -23,6 +22,6 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/OGDF) # 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}/lib/minisat/doc ${CURRENT_PACKAGES_DIR}/include/ogdf/lib/minisat/doc) |