diff options
| author | Maxime GIMENO <maxime.gimeno@gmail.com> | 2018-10-09 05:35:15 +0200 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-10-08 20:35:15 -0700 |
| commit | aa7a584767bff5138623f52fb677a1ca9295541e (patch) | |
| tree | 1549929a757b052e1445bec283bf87f51c27ecda | |
| parent | b0137ff28858932ae02f85e21f2d3651dd253187 (diff) | |
| download | vcpkg-aa7a584767bff5138623f52fb677a1ca9295541e.tar.gz vcpkg-aa7a584767bff5138623f52fb677a1ca9295541e.zip | |
[cgal] Update to 4.13. (#4390)
* Update to 4.13 and minimize the qt5 dependency.
* [cgal] Fix license installation for new git repo layout
* [cgal] Remove vcpkg_test_cmake until x64 can be fixed
| -rw-r--r-- | ports/cgal/CONTROL | 4 | ||||
| -rw-r--r-- | ports/cgal/portfile.cmake | 34 |
2 files changed, 29 insertions, 9 deletions
diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL index 12765f391..ef39cf54e 100644 --- a/ports/cgal/CONTROL +++ b/ports/cgal/CONTROL @@ -1,8 +1,8 @@ Source: cgal -Version: 4.12 +Version: 4.13-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 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 -Build-Depends: qt5 +Build-Depends: qt5-base, qt5-3d, qt5-svg, qt5-xmlpatterns, qt5-script, eigen3 Description: Qt GUI support for CGAL diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake index 1d9661862..bf261f66a 100644 --- a/ports/cgal/portfile.cmake +++ b/ports/cgal/portfile.cmake @@ -3,13 +3,13 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CGAL/cgal - REF f7c3c8212b56c0d6dae63787efc99093f4383415 - SHA512 fc40483b5f0e2071c3458cbd67ee7e503f68b7f6a1bbb525b6003d1a440e662cb85c257167ce6d55a73e0cc49b27a7d2b56dcf6b5eeddc78772567fdc48ba160 + REF releases/CGAL-4.13 + SHA512 3a12d7f567487c282928a162a47737c41c22258556ca0083b9cf492fc8f0a7c334b491b14dbfd6a62e71feeeb1b4995769c13a604e0882548f21c41b996d4eaf HEAD_REF master ) set(WITH_CGAL_Qt5 OFF) -if("qt5" IN_LIST FEATURES) +if("qt" IN_LIST FEATURES) set(WITH_CGAL_Qt5 ON) endif() @@ -30,11 +30,31 @@ vcpkg_copy_pdbs() # Clean file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +else() + foreach(ROOT ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE + ${ROOT}/cgal_create_CMakeLists + ${ROOT}/cgal_create_cmake_script + ${ROOT}/cgal_make_macosx_app + ) + 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}") - -# Handle copyright of suitesparse and metis -file(COPY ${SOURCE_PATH}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/cgal) +file(WRITE ${CURRENT_PACKAGES_DIR}/lib/cgal/CGALConfig.cmake "${_contents}") + +file(COPY ${SOURCE_PATH}/Installation/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cgal) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/cgal/LICENSE ${CURRENT_PACKAGES_DIR}/share/cgal/copyright) + +file( + COPY + ${SOURCE_PATH}/Installation/LICENSE.BSL + ${SOURCE_PATH}/Installation/LICENSE.FREE_USE + ${SOURCE_PATH}/Installation/LICENSE.GPL + ${SOURCE_PATH}/Installation/LICENSE.LGPL + DESTINATION ${CURRENT_PACKAGES_DIR}/share/cgal +) |