aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime GIMENO <maxime.gimeno@gmail.com>2018-11-08 08:50:15 +0100
committerRobert Schumacher <roschuma@microsoft.com>2018-11-07 23:50:15 -0800
commit130bd6f868e1c06264161fb3f24ec28b1a1fb354 (patch)
tree0a1d5c5a73d9a8bbd748f3be58971d905705be65
parent8407472fb2540efac6818ac1cd0e3b1734ce36ce (diff)
downloadvcpkg-130bd6f868e1c06264161fb3f24ec28b1a1fb354.tar.gz
vcpkg-130bd6f868e1c06264161fb3f24ec28b1a1fb354.zip
CGAL: Fix CMakeConfig.cmake (#4655)
* Fix CMakeConfig * [cgal] Bump control version
-rw-r--r--ports/cgal/CONTROL2
-rw-r--r--ports/cgal/portfile.cmake4
2 files changed, 4 insertions, 2 deletions
diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL
index ef39cf54e..a84c50ce1 100644
--- a/ports/cgal/CONTROL
+++ b/ports/cgal/CONTROL
@@ -1,5 +1,5 @@
Source: cgal
-Version: 4.13-1
+Version: 4.13-2
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.
diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake
index bf261f66a..40475b7c2 100644
--- a/ports/cgal/portfile.cmake
+++ b/ports/cgal/portfile.cmake
@@ -45,7 +45,9 @@ 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}/lib/cgal/CGALConfig.cmake "${_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)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/cgal/LICENSE ${CURRENT_PACKAGES_DIR}/share/cgal/copyright)