Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[geogram] update to 1.6.0 (#2965) 

* [geogram] update to 1.6.0

+ fix corrupted patch

* [changelog] Revert change to previous updates
This commit is contained in:
Yann Lanthony 2018-03-08 02:56:38 +01:00 committed by Robert Schumacher
parent e629afa182
commit 82ce7b2c2f
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/geogram/CONTROL
View File

@ -1,4 +1,4 @@
Source: geogram
Version: 1.4.9-1
Version: 1.6.0-1
Description: Geogram is a programming library of geometric algorithms.
Build-Depends: glfw3, openblas, clapack

6
ports/geogram/fix-cmake-config-and-install.patch
View File

@ -2,8 +2,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 17dc02e..e489d75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ set(VORPALINE_VERSION_MINOR 4)
set(VORPALINE_VERSION_PATCH 9)
@@ -42,7 +42,7 @@ set(VORPALINE_VERSION_MINOR 6)
set(VORPALINE_VERSION_PATCH 0)
set(VORPALINE_VERSION ${VORPALINE_VERSION_MAJOR}.${VORPALINE_VERSION_MINOR}.${VORPALINE_VERSION_PATCH})
-set(VORPALINE_INCLUDE_SUBPATH geogram${VORPALINE_VERSION_MAJOR})
@ -130,7 +130,7 @@ diff --git a/src/lib/third_party/numerics/CMakeLists.txt b/src/lib/third_party/n
index 5789cd2..e4262e3 100644
--- a/src/lib/third_party/numerics/CMakeLists.txt
+++ b/src/lib/third_party/numerics/CMakeLists.txt
@@ -10,16 +10,18 @@ endif()
@@ -10,16 +10,19 @@ endif()
include_directories(${GEOGRAM_SOURCE_DIR}/src/lib/third_party/numerics/INCLUDE)

8
ports/geogram/portfile.cmake
View File

@ -12,11 +12,11 @@
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/geogram_1.4.9)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/geogram_1.6.0)
vcpkg_download_distfile(ARCHIVE
URLS "https://gforge.inria.fr/frs/download.php/file/36914/geogram_1.4.9.zip"
FILENAME "geogram-1.4.9.zip"
SHA512 de8a93abca90885c3ce1ad6b828442daa1eeaf016594fe707f25c8d4077c6b6cec0958a0662c0aed4ff015a994a55d7ebc7521cbb39b9adcf4373c44c957715e
URLS "https://gforge.inria.fr/frs/download.php/file/37375/geogram_1.6.0.zip"
FILENAME "geogram-1.6.0.zip"
SHA512 8ae0f976338b4e47e2ef3c8cebc48e3957133131be89318df187295b813d3b45557a7dae848b42366635c3f957a63161da2302bb73e6a2af8dd745cfcc122988
)
vcpkg_extract_source_archive(${ARCHIVE})
file(COPY ${CURRENT_PORT_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH}/cmake)