diff options
| author | Maxime GIMENO <maxime.gimeno@gmail.com> | 2021-04-30 00:48:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-29 15:48:08 -0700 |
| commit | 76a5e426abc84d65818f13b643562325a7a20ab2 (patch) | |
| tree | 77196b186dff64d4ea315a240117ab52675afaa7 | |
| parent | 16cb5ff369b4997ddc8c2974106f7aecc1d1e78e (diff) | |
| download | vcpkg-76a5e426abc84d65818f13b643562325a7a20ab2.tar.gz vcpkg-76a5e426abc84d65818f13b643562325a7a20ab2.zip | |
[CGAL] Fix the configuration file (#17300)
* Remove the CGALConfig.cmake in /lib/cgal to only keep the original stuff in /share/cgal. This will fix the missing CGAL_VERSION.
* Update CONTROL version
* update baseline version
| -rw-r--r-- | ports/cgal/CONTROL | 2 | ||||
| -rw-r--r-- | ports/cgal/portfile.cmake | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/c-/cgal.json | 5 |
4 files changed, 7 insertions, 4 deletions
diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL index 680875356..0bfaebf5d 100644 --- a/ports/cgal/CONTROL +++ b/ports/cgal/CONTROL @@ -1,6 +1,6 @@ Source: cgal Version: 5.2 -Port-Version: 2 +Port-Version: 3 Build-Depends: mpfr, gmp, zlib, boost-accumulators, boost-algorithm, boost-bimap, boost-callable-traits, boost-concept-check, boost-container, boost-core, boost-detail, boost-filesystem, boost-functional, boost-fusion, boost-geometry, boost-graph, boost-heap, boost-intrusive, boost-iostreams, boost-iterator, boost-lambda, boost-logic, boost-math, boost-mpl, boost-multi-index, boost-multiprecision, boost-numeric-conversion, boost-optional, boost-parameter, boost-pool, boost-preprocessor, boost-property-map, boost-property-tree, boost-ptr-container, boost-random, boost-range, boost-serialization, boost-spirit, boost-thread, boost-tuple, boost-type-traits, boost-units, boost-utility, boost-variant Homepage: https://github.com/CGAL/cgal 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. diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake index 8e306608e..562343cc3 100644 --- a/ports/cgal/portfile.cmake +++ b/ports/cgal/portfile.cmake @@ -41,8 +41,6 @@ else() endforeach() endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/lib/cgal/CGALConfig.cmake "include (\$\{CMAKE_CURRENT_LIST_DIR\}/../../share/cgal/CGALConfig.cmake)") - file(INSTALL ${SOURCE_PATH}/Installation/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file( diff --git a/versions/baseline.json b/versions/baseline.json index b0eb94ad8..ee4259ce1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1158,7 +1158,7 @@ }, "cgal": { "baseline": "5.2", - "port-version": 2 + "port-version": 3 }, "cgicc": { "baseline": "3.2.19-4", diff --git a/versions/c-/cgal.json b/versions/c-/cgal.json index aaaad1930..108360e4c 100644 --- a/versions/c-/cgal.json +++ b/versions/c-/cgal.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "14e2dc513d60c6c31b5fd94c6e891ac33fcb328f", + "version-string": "5.2", + "port-version": 3 + }, + { "git-tree": "6d5aeedca6a3ace515272f0d3a1fc150efde9076", "version-string": "5.2", "port-version": 2 |