diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-04-02 16:53:20 -0700 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-04-02 16:53:20 -0700 |
| commit | 9596fe7dd72179045cd9460730a71e197e82b1c2 (patch) | |
| tree | c27ae77fe5a646686bbf72f910416dfbb2af9e0b /ports/cgal | |
| parent | f41cc7b47cd0e846e047891b605f6870cc598ccb (diff) | |
| parent | 0fffb47ed02507aeacc29c64d91e9d4639f981f6 (diff) | |
| download | vcpkg-9596fe7dd72179045cd9460730a71e197e82b1c2.tar.gz vcpkg-9596fe7dd72179045cd9460730a71e197e82b1c2.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into pr/cmake_3_14
Diffstat (limited to 'ports/cgal')
| -rw-r--r-- | ports/cgal/CONTROL | 4 | ||||
| -rw-r--r-- | ports/cgal/portfile.cmake | 18 |
2 files changed, 13 insertions, 9 deletions
diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL index 7412e414a..e3131bb20 100644 --- a/ports/cgal/CONTROL +++ b/ports/cgal/CONTROL @@ -1,6 +1,6 @@ Source: cgal -Version: 4.13-3 -Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic +Version: 4.14-1 +Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic, boost-multiprecision Description: The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry. Feature: qt diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake index e73547afc..58199cc54 100644 --- a/ports/cgal/portfile.cmake +++ b/ports/cgal/portfile.cmake @@ -1,10 +1,17 @@ include(vcpkg_common_functions) +string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH) +if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32) + message(WARNING "Cgal's buildsystem uses very long paths and may fail on your system.\n" + "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command." + ) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CGAL/cgal - REF releases/CGAL-4.13 - SHA512 3a12d7f567487c282928a162a47737c41c22258556ca0083b9cf492fc8f0a7c334b491b14dbfd6a62e71feeeb1b4995769c13a604e0882548f21c41b996d4eaf + REF releases/CGAL-4.14 + SHA512 c70b3ad475f6b2c03ecb540e195b4d26a709205c511b0c705dfddb5b14ef372453ce1d4d49ed342fcd21ba654dea793e91c058afae626276bfb3cfd72bccb382 HEAD_REF master ) @@ -42,11 +49,6 @@ else() endforeach() endif() -file(READ ${CURRENT_PACKAGES_DIR}/share/cgal/CGALConfig.cmake _contents) -string(REPLACE "CGAL_IGNORE_PRECONFIGURED_GMP" "1" _contents "${_contents}") -string(REPLACE "CGAL_IGNORE_PRECONFIGURED_MPFR" "1" _contents "${_contents}") - -file(WRITE ${CURRENT_PACKAGES_DIR}/share/cgal/CGALConfig.cmake "${_contents}") file(WRITE ${CURRENT_PACKAGES_DIR}/lib/cgal/CGALConfig.cmake "include (\$\{CMAKE_CURRENT_LIST_DIR\}/../../share/cgal/CGALConfig.cmake)") file(COPY ${SOURCE_PATH}/Installation/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cgal) @@ -60,3 +62,5 @@ file( ${SOURCE_PATH}/Installation/LICENSE.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/cgal ) + +vcpkg_test_cmake(PACKAGE_NAME CGAL) |