aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2018-01-08 23:36:02 -0800
committerGitHub <noreply@github.com>2018-01-08 23:36:02 -0800
commitcce3f40e00094299c94bb783576ea9c18dd6aa27 (patch)
tree83bb303e40491f3c2b595640e8aee133a702ee0c
parent65d56f25bb97dcab13430fc206e81fcda5f43978 (diff)
parenteb34e61d6d1a01851db311776f8f6218449ca53c (diff)
downloadvcpkg-cce3f40e00094299c94bb783576ea9c18dd6aa27.tar.gz
vcpkg-cce3f40e00094299c94bb783576ea9c18dd6aa27.zip
Merge pull request #2529 from albertziegenhagel/fix-cgal-head
[cgal] Fix installation with --head
-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 c2331f294..2fc86bd11 100644
--- a/ports/cgal/CONTROL
+++ b/ports/cgal/CONTROL
@@ -1,4 +1,4 @@
Source: cgal
-Version: 4.11-1
+Version: 4.11-2
Build-Depends: mpfr, mpir, zlib, qt5, boost-format, boost-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random
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 9ef8c189d..642e88920 100644
--- a/ports/cgal/portfile.cmake
+++ b/ports/cgal/portfile.cmake
@@ -11,11 +11,13 @@ vcpkg_from_github(
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
+ OPTIONS
+ -DCGAL_INSTALL_CMAKE_DIR=share/cgal
)
vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/CGAL")
+vcpkg_fixup_cmake_targets()
vcpkg_copy_pdbs()