diff options
Diffstat (limited to 'ports/geogram')
| -rw-r--r-- | ports/geogram/CONTROL | 2 | ||||
| -rw-r--r-- | ports/geogram/fix-cmake-config-and-install.patch | 2 | ||||
| -rw-r--r-- | ports/geogram/portfile.cmake | 80 |
3 files changed, 34 insertions, 50 deletions
diff --git a/ports/geogram/CONTROL b/ports/geogram/CONTROL index 687174914..7b19ca9cf 100644 --- a/ports/geogram/CONTROL +++ b/ports/geogram/CONTROL @@ -1,5 +1,5 @@ Source: geogram -Version: 1.6.4 +Version: 1.6.9-2 Description: Geogram is a programming library of geometric algorithms. Build-Depends: openblas, clapack diff --git a/ports/geogram/fix-cmake-config-and-install.patch b/ports/geogram/fix-cmake-config-and-install.patch index f5d933586..2c7790923 100644 --- a/ports/geogram/fix-cmake-config-and-install.patch +++ b/ports/geogram/fix-cmake-config-and-install.patch @@ -3,7 +3,7 @@ index 17dc02e..e489d75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ set(VORPALINE_VERSION_MINOR 6) - set(VORPALINE_VERSION_PATCH 4) + set(VORPALINE_VERSION_PATCH 9) set(VORPALINE_VERSION ${VORPALINE_VERSION_MAJOR}.${VORPALINE_VERSION_MINOR}.${VORPALINE_VERSION_PATCH}) -set(VORPALINE_INCLUDE_SUBPATH geogram${VORPALINE_VERSION_MAJOR}) diff --git a/ports/geogram/portfile.cmake b/ports/geogram/portfile.cmake index 17060723f..46709f6c3 100644 --- a/ports/geogram/portfile.cmake +++ b/ports/geogram/portfile.cmake @@ -1,64 +1,48 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg> -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# - include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/geogram_1.6.4) +set(GEOGRAM_VERSION 1.6.9) + vcpkg_download_distfile(ARCHIVE - URLS "https://gforge.inria.fr/frs/download.php/file/37525/geogram_1.6.4.tar.gz" - FILENAME "geogram_1.6.4.tar.gz" - SHA512 a89b824cc7c055b7d0a5882e2f1922f09729f6eed5ed656136e8375e9b414e286fdbc5372fdb69b1ea5ce340dc81231db0228974b997be805043227de3c341b8 + URLS "https://gforge.inria.fr/frs/download.php/file/37779/geogram_${GEOGRAM_VERSION}.tar.gz" + FILENAME "geogram_${GEOGRAM_VERSION}.tar.gz" + SHA512 1b5c7540bef734c1908f213f26780aba63b4911a8022d5eb3f7c90eabe2cb69efd1f298b30cdc8e2c636a5b37c8c25832dd4aad0b7c2ff5f0a5b5caa17970136 ) -vcpkg_extract_source_archive(${ARCHIVE}) -file(COPY ${CURRENT_PORT_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH}/cmake) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-cmake-config-and-install.patch + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${GEOGRAM_VERSION} + PATCHES fix-cmake-config-and-install.patch ) +file(COPY ${CURRENT_PORT_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH}/cmake) + set(GEOGRAM_WITH_GRAPHICS OFF) if("graphics" IN_LIST FEATURES) set(GEOGRAM_WITH_GRAPHICS ON) endif() -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - # PREFER_NINJA # Disable this option if project cannot be built with Ninja - OPTIONS - -DVORPALINE_BUILD_DYNAMIC=FALSE - -DGEOGRAM_WITH_GRAPHICS=${GEOGRAM_WITH_GRAPHICS} - -DGEOGRAM_LIB_ONLY=ON - -DGEOGRAM_USE_SYSTEM_GLFW3=ON - -DVORPALINE_PLATFORM=Win-vs-generic - -DGEOGRAM_WITH_VORPALINE=OFF - # OPTIONS_RELEASE -DOPTIMIZE=1 - # OPTIONS_DEBUG -DDEBUGGABLE=1 - ) +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(VORPALINE_BUILD_DYNAMIC FALSE) + set(VORPALINE_PLATFORM Win-vs-generic) else() - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - # PREFER_NINJA # Disable this option if project cannot be built with Ninja - OPTIONS - -DVORPALINE_BUILD_DYNAMIC=TRUE - -DGEOGRAM_WITH_GRAPHICS=${GEOGRAM_WITH_GRAPHICS} - -DGEOGRAM_LIB_ONLY=ON - -DGEOGRAM_USE_SYSTEM_GLFW3=ON - -DVORPALINE_PLATFORM=Win-vs-dynamic-generic - -DGEOGRAM_WITH_VORPALINE=OFF - # OPTIONS_RELEASE -DOPTIMIZE=1 - # OPTIONS_DEBUG -DDEBUGGABLE=1 - ) + set(VORPALINE_BUILD_DYNAMIC TRUE) + set(VORPALINE_PLATFORM Win-vs-dynamic-generic) endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + # Geogram cannot be built with ninja because it embeds $(Configuration) in some of the generated paths. These require MSBuild in order to be evaluated. + #PREFER_NINJA # Disable this option if project cannot be built with Ninja + OPTIONS + -DVORPALINE_BUILD_DYNAMIC=${VORPALINE_BUILD_DYNAMIC} + -DGEOGRAM_WITH_GRAPHICS=${GEOGRAM_WITH_GRAPHICS} + -DGEOGRAM_LIB_ONLY=ON + -DGEOGRAM_USE_SYSTEM_GLFW3=ON + -DVORPALINE_PLATFORM=${VORPALINE_PLATFORM} + -DGEOGRAM_WITH_VORPALINE=OFF +) + vcpkg_install_cmake() vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH "share/geogram") |