From 63578d09b00fb2b33ddc0d38685eadbb1a3ffa3a Mon Sep 17 00:00:00 2001 From: Li Jiang Date: Tue, 14 Jul 2020 04:37:29 +0800 Subject: [PATCH] [openmesh] Upgrade to 8.1 (#11739) * upgrade openmesh to 8.1 Tested on Window 10 with Visual Studio 2019 x64 * update version for CONTROL file * 1. Remove obsolete function `include(vcpkg_common_functions)` 2. Use `vcpkg_fixup_cmake_targets()` * fix build error on Linux Co-authored-by: Robert Schumacher --- ports/openmesh/CONTROL | 3 +-- ports/openmesh/portfile.cmake | 12 +++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ports/openmesh/CONTROL b/ports/openmesh/CONTROL index 41b01d0497..08bb719982 100644 --- a/ports/openmesh/CONTROL +++ b/ports/openmesh/CONTROL @@ -1,4 +1,3 @@ Source: openmesh -Version: 8.0-1 -Homepage: https://www.openmesh.org +Version: 8.1 Description: A generic and efficient polygon mesh data structure diff --git a/ports/openmesh/portfile.cmake b/ports/openmesh/portfile.cmake index 294c98d914..7ff6cf13a3 100644 --- a/ports/openmesh/portfile.cmake +++ b/ports/openmesh/portfile.cmake @@ -1,10 +1,10 @@ -set(VERSION 8.0) +set(VERSION 8.1) # Note: upstream GitLab instance at https://graphics.rwth-aachen.de:9000 often goes down vcpkg_download_distfile(ARCHIVE URLS "https://www.openmesh.org/media/Releases/${VERSION}/OpenMesh-${VERSION}.tar.gz" FILENAME "OpenMesh-${VERSION}.tar.gz" - SHA512 6c9cb323d83d48daca7ddefe51df67f611befd657655d8013c2c620ad53e0b8521e6b8e25ebf3f5321f94182252ae0c75795875ff7ac11585e4ffa79e16f8008 + SHA512 c146e6b21d709a31772621a6a913def93a51460c4abb950c2eb64eea4528c7efd4c86166ba56ae0bc8090cc5878dd9328b570e094e61c1b64d6d298de05aca61 ) vcpkg_extract_source_archive_ex( @@ -21,18 +21,16 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja - OPTIONS + PREFER_NINJA + OPTIONS -DBUILD_APPS=OFF -DOPENMESH_BUILD_SHARED=${OPENMESH_BUILD_SHARED} # [TODO]: add apps as feature, requires qt5 and freeglut - # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 - # OPTIONS_RELEASE -DOPTIMIZE=1 - # OPTIONS_DEBUG -DDEBUGGABLE=1 ) vcpkg_install_cmake() vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/OpenMesh/cmake TARGET_PATH share/OpenMesh/cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/OpenMesh/Tools/VDPM/xpm)