diff options
| author | Laurent Rineau <Laurent.Rineau@cgal.org> | 2019-03-11 21:48:26 +0100 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-03-11 13:48:26 -0700 |
| commit | 5862fba5ff99d933a8d9d3922a73a5582b8bc3ff (patch) | |
| tree | 60ed0a0060722a91951e4cf7a9053e2ec3ad96c6 | |
| parent | 3eb244085f641e70ef9ac68c4933a9597242fc23 (diff) | |
| download | vcpkg-5862fba5ff99d933a8d9d3922a73a5582b8bc3ff.tar.gz vcpkg-5862fba5ff99d933a8d9d3922a73a5582b8bc3ff.zip | |
Install CGAL as header-only (#4975)
* Update to install CGAL as header-only
I think the issue #2471 would be completely solved, if vcpkg installed CGAL as header-only. That way, the installed `CGALConfig.cmake` would search for its dependencies, instead of hard-coding their path in the file.
* Bump the version
* Fix the cleaning
Once CGAL is header-only, no binary library is created, and the
`debug/` directory got empty.
This commit fixes the cleaning: now the whole `debug/` directory is
removed.
| -rw-r--r-- | ports/cgal/CONTROL | 2 | ||||
| -rw-r--r-- | ports/cgal/portfile.cmake | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL index a84c50ce1..7412e414a 100644 --- a/ports/cgal/CONTROL +++ b/ports/cgal/CONTROL @@ -1,5 +1,5 @@ Source: cgal -Version: 4.13-2 +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 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 40475b7c2..e73547afc 100644 --- a/ports/cgal/portfile.cmake +++ b/ports/cgal/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS + -DCGAL_HEADER_ONLY=ON -DCGAL_INSTALL_CMAKE_DIR=share/cgal -DWITH_CGAL_Qt5=${WITH_CGAL_Qt5} ) @@ -28,12 +29,11 @@ vcpkg_fixup_cmake_targets() vcpkg_copy_pdbs() # Clean -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) else() - foreach(ROOT ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + foreach(ROOT ${CURRENT_PACKAGES_DIR}/bin) file(REMOVE ${ROOT}/cgal_create_CMakeLists ${ROOT}/cgal_create_cmake_script |