mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-01 15:31:47 +08:00
50 lines
2.0 KiB
Diff
50 lines
2.0 KiB
Diff
|
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)
|