diff options
| author | Yann Lanthony <yann.lanthony@gmail.com> | 2018-03-08 02:56:38 +0100 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-03-07 17:56:38 -0800 |
| commit | 82ce7b2c2fd53aad8d951e3562f93180842e5e38 (patch) | |
| tree | 2db1f4f7c34b8ba54f8a22acc6c7bc4fe193ba6d | |
| parent | e629afa182b146e9d1df79e939759af68a555289 (diff) | |
| download | vcpkg-82ce7b2c2fd53aad8d951e3562f93180842e5e38.tar.gz vcpkg-82ce7b2c2fd53aad8d951e3562f93180842e5e38.zip | |
[geogram] update to 1.6.0 (#2965)
* [geogram] update to 1.6.0
+ fix corrupted patch
* [changelog] Revert change to previous updates
| -rw-r--r-- | ports/geogram/CONTROL | 2 | ||||
| -rw-r--r-- | ports/geogram/fix-cmake-config-and-install.patch | 6 | ||||
| -rw-r--r-- | ports/geogram/portfile.cmake | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/ports/geogram/CONTROL b/ports/geogram/CONTROL index f79aa5997..81df11d9c 100644 --- a/ports/geogram/CONTROL +++ b/ports/geogram/CONTROL @@ -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 diff --git a/ports/geogram/fix-cmake-config-and-install.patch b/ports/geogram/fix-cmake-config-and-install.patch index 77f1ef1c2..d4dce24e1 100644 --- a/ports/geogram/fix-cmake-config-and-install.patch +++ b/ports/geogram/fix-cmake-config-and-install.patch @@ -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) diff --git a/ports/geogram/portfile.cmake b/ports/geogram/portfile.cmake index 17c9d2281..17a03e6a5 100644 --- a/ports/geogram/portfile.cmake +++ b/ports/geogram/portfile.cmake @@ -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) |