3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 19:25:27 +08:00
Code Issues Projects Releases Wiki Activity

Install CGAL as header-only (#4975)

Browse Source 
* 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.
This commit is contained in:
Laurent Rineau 2019-03-11 21:48:26 +01:00 committed by Phil Christensen
parent 3eb244085f
commit 5862fba5ff
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/cgal/CONTROL
View File

@ -1,5 +1,5 @@
Source: cgal 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 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. 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.

8
ports/cgal/portfile.cmake
View File

@ -17,6 +17,7 @@ vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA PREFER_NINJA
OPTIONS OPTIONS
-DCGAL_HEADER_ONLY=ON
-DCGAL_INSTALL_CMAKE_DIR=share/cgal -DCGAL_INSTALL_CMAKE_DIR=share/cgal
-DWITH_CGAL_Qt5=${WITH_CGAL_Qt5} -DWITH_CGAL_Qt5=${WITH_CGAL_Qt5}
) )
@ -28,12 +29,11 @@ vcpkg_fixup_cmake_targets()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
# Clean # Clean
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") 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() else()
foreach(ROOT ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) foreach(ROOT ${CURRENT_PACKAGES_DIR}/bin)
file(REMOVE file(REMOVE
${ROOT}/cgal_create_CMakeLists ${ROOT}/cgal_create_CMakeLists
${ROOT}/cgal_create_cmake_script ${ROOT}/cgal_create_cmake_script