mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-18 20:23:02 +08:00
[cgal] Fix incorrect warning message (#24112)
* [cgal] Install data folder * version * Add double quotes * version * version * Add comment to patch * version
This commit is contained in:
parent
8e1f46de11
commit
6506e80eb2
15
ports/cgal/fix-incorrect-warning.patch
Normal file
15
ports/cgal/fix-incorrect-warning.patch
Normal file
@ -0,0 +1,15 @@
|
||||
diff --git a/Installation/lib/cmake/CGAL/CGALConfig.cmake b/Installation/lib/cmake/CGAL/CGALConfig.cmake
|
||||
index 4f3a16b..6edefb1 100644
|
||||
--- a/Installation/lib/cmake/CGAL/CGALConfig.cmake
|
||||
+++ b/Installation/lib/cmake/CGAL/CGALConfig.cmake
|
||||
@@ -89,7 +89,9 @@ if (NOT CGAL_DATA_DIR)
|
||||
if (EXISTS "${CMAKE_SOURCE_DIR}/../../data")
|
||||
set(CGAL_DATA_DIR "${CMAKE_SOURCE_DIR}/../../data")
|
||||
else()
|
||||
- message(WARNING "CGAL_DATA_DIR cannot be deduced, set the variable CGAL_DATA_DIR to set the default value of CGAL::data_file_path()")
|
||||
+ if(CGAL_TEST_SUITE)
|
||||
+ message(WARNING "CGAL_DATA_DIR cannot be deduced, set the variable CGAL_DATA_DIR to set the default value of CGAL::data_file_path()")
|
||||
+ endif()
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
@ -1,3 +1,4 @@
|
||||
# Header only
|
||||
vcpkg_buildpath_length_warning(37)
|
||||
|
||||
vcpkg_from_github(
|
||||
@ -6,6 +7,7 @@ vcpkg_from_github(
|
||||
REF v5.4.1
|
||||
SHA512 2ec6167d8ebf1df121f1ac372d01862f7f3acb043deea4a334e0329976306f9c9e917cdc66b355728d3f99fdb76f5491d96f10fff660716ce27bfd3793380875
|
||||
HEAD_REF master
|
||||
PATCHES fix-incorrect-warning.patch # https://github.com/CGAL/cgal/pull/6649
|
||||
)
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
@ -18,7 +20,14 @@ vcpkg_cmake_configure(
|
||||
OPTIONS
|
||||
-DCGAL_HEADER_ONLY=ON
|
||||
-DCGAL_INSTALL_CMAKE_DIR=share/cgal
|
||||
-DBUILD_TESTING=OFF
|
||||
-DBUILD_DOC=OFF
|
||||
-DCGAL_BUILD_THREE_DOC=OFF
|
||||
${FEATURE_OPTIONS}
|
||||
MAYBE_UNUSED_VARIABLES
|
||||
CGAL_BUILD_THREE_DOC
|
||||
CGAL_HEADER_ONLY
|
||||
WITH_CGAL_Qt5
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
@ -28,28 +37,28 @@ vcpkg_cmake_config_fixup()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
# Clean
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
|
||||
else()
|
||||
foreach(ROOT ${CURRENT_PACKAGES_DIR}/bin)
|
||||
foreach(ROOT "${CURRENT_PACKAGES_DIR}/bin")
|
||||
file(REMOVE
|
||||
${ROOT}/cgal_create_CMakeLists
|
||||
${ROOT}/cgal_create_cmake_script
|
||||
${ROOT}/cgal_make_macosx_app
|
||||
"${ROOT}/cgal_create_CMakeLists"
|
||||
"${ROOT}/cgal_create_cmake_script"
|
||||
"${ROOT}/cgal_make_macosx_app"
|
||||
)
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
file(INSTALL ${SOURCE_PATH}/Installation/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
file(INSTALL "${SOURCE_PATH}/Installation/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
|
||||
file(
|
||||
COPY
|
||||
${SOURCE_PATH}/Installation/LICENSE.BSL
|
||||
${SOURCE_PATH}/Installation/LICENSE.RFL
|
||||
${SOURCE_PATH}/Installation/LICENSE.GPL
|
||||
${SOURCE_PATH}/Installation/LICENSE.LGPL
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
|
||||
"${SOURCE_PATH}/Installation/LICENSE.BSL"
|
||||
"${SOURCE_PATH}/Installation/LICENSE.RFL"
|
||||
"${SOURCE_PATH}/Installation/LICENSE.GPL"
|
||||
"${SOURCE_PATH}/Installation/LICENSE.LGPL"
|
||||
DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
|
||||
)
|
||||
|
||||
file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
|
||||
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "cgal",
|
||||
"version": "5.4.1",
|
||||
"port-version": 1,
|
||||
"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.",
|
||||
"homepage": "https://github.com/CGAL/cgal",
|
||||
"license": "GPL-3.0-or-later AND LGPL-3.0-or-later AND BSL-1.0",
|
||||
|
@ -1326,7 +1326,7 @@
|
||||
},
|
||||
"cgal": {
|
||||
"baseline": "5.4.1",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"cgicc": {
|
||||
"baseline": "3.2.19",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "de8aef00f45ff890d5b4ce4aae56afbc559a5fea",
|
||||
"version": "5.4.1",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "898c2a987fc0104e3c8ba17afde418672e3b0019",
|
||||
"version": "5.4.1",
|
||||
|
Loading…
Reference in New Issue
Block a user