3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-17 04:28:16 +08:00
Code Issues Projects Releases Wiki Activity

remove patch

Browse Source
This commit is contained in:
Maxime Gimeno 2019-10-18 14:24:21 +02:00
parent f9a99f6317
commit 042011d52f
2 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
ports/cgal/cgal_target_fix.patch
View File

@ -1,49 +0,0 @@
From a0bfaee9ebed49fb65c93d7fb00a0c24c1898841 Mon Sep 17 00:00:00 2001
From: Laurent Rineau <laurent.rineau@cgal.org>
Date: Fri, 10 May 2019 17:31:17 +0200
Subject: [PATCH 1/2] Consider CGAL as an imported target
---
Installation/lib/cmake/CGAL/CGALConfig.cmake | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Installation/lib/cmake/CGAL/CGALConfig.cmake b/Installation/lib/cmake/CGAL/CGALConfig.cmake
index c2b0aed549d..08d757aad7f 100644
--- a/Installation/lib/cmake/CGAL/CGALConfig.cmake
+++ b/Installation/lib/cmake/CGAL/CGALConfig.cmake
@@ -116,7 +116,11 @@ include(CGAL_setup_target_dependencies)
foreach(cgal_lib ${CGAL_LIBRARIES})
set(WITH_${cgal_lib} TRUE)
if(${cgal_lib}_FOUND AND NOT TARGET ${cgal_lib})
- add_library(${cgal_lib} INTERFACE)
+ if(CGAL_BUILDING_LIBS)
+ add_library(${cgal_lib} INTERFACE)
+ else()
+ add_library(${cgal_lib} INTERFACE IMPORTED GLOBAL)
+ endif()
if(NOT TARGET CGAL::${cgal_lib})
add_library(CGAL::${cgal_lib} ALIAS ${cgal_lib})
endif()
From c2e8365303b97669fe50ea2427c9943049575be4 Mon Sep 17 00:00:00 2001
From: Laurent Rineau <laurent.rineau@cgal.org>
Date: Fri, 10 May 2019 17:47:58 +0200
Subject: [PATCH 2/2] Actually, it can only work with CMake>=3.11
---
Installation/lib/cmake/CGAL/CGALConfig.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Installation/lib/cmake/CGAL/CGALConfig.cmake b/Installation/lib/cmake/CGAL/CGALConfig.cmake
index 08d757aad7f..8ef95a85c94 100644
--- a/Installation/lib/cmake/CGAL/CGALConfig.cmake
+++ b/Installation/lib/cmake/CGAL/CGALConfig.cmake
@@ -116,7 +116,7 @@ include(CGAL_setup_target_dependencies)
foreach(cgal_lib ${CGAL_LIBRARIES})
set(WITH_${cgal_lib} TRUE)
if(${cgal_lib}_FOUND AND NOT TARGET ${cgal_lib})
- if(CGAL_BUILDING_LIBS)
+ if(CGAL_BUILDING_LIBS OR CMAKE_VERSION VERSION_LESS "3.11")
add_library(${cgal_lib} INTERFACE)
else()
add_library(${cgal_lib} INTERFACE IMPORTED GLOBAL)

2
ports/cgal/portfile.cmake
View File

@ -8,8 +8,6 @@ vcpkg_from_github(
REF releases/CGAL-5.0-beta1
SHA512 a51927d1371297d5db06ce77309a43b480582e42a64844e95cbd7fe7308952df8360ec0ec1a6044478162f0b261622789d3fc0a46834959421db50d02c5d6f98
HEAD_REF master
PATCHES
cgal_target_fix.patch
)
set(WITH_CGAL_Qt5 OFF)