From 670c6ae58c68adee256396b5e1383b324150d5d2 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 9 Mar 2021 20:17:41 +0100
Subject: [PATCH] [cpm] Fixed shapelib used from system.
---
scripts/cmake/Dependencies.cmake | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake
index 150b2dabcf1..2bf2e408f99 100644
--- a/scripts/cmake/Dependencies.cmake
+++ b/scripts/cmake/Dependencies.cmake
@@ -263,14 +263,19 @@ if(OGS_BUILD_GUI)
endif()
if(OGS_BUILD_GUI)
- CPMAddPackage(
- NAME shapelib
- GITHUB_REPOSITORY OSGeo/shapelib
- VERSION 1.5.0
- EXCLUDE_FROM_ALL YES
- )
- if(shapelib_ADDED)
- target_include_directories(shp INTERFACE $<BUILD_INTERFACE:${shapelib_SOURCE_DIR}>)
+ find_package(Shapelib QUIET)
+ if(Shapelib_FOUND)
+ add_library(shp INTERFACE IMPORTED)
+ target_include_directories(shp INTERFACE ${Shapelib_INCLUDE_DIRS})
+ target_link_libraries(shp INTERFACE ${Shapelib_LIBRARIES})
+ else()
+ CPMAddPackage(
+ NAME Shapelib
+ GITHUB_REPOSITORY OSGeo/shapelib
+ VERSION 1.5.0
+ EXCLUDE_FROM_ALL YES
+ )
+ target_include_directories(shp INTERFACE $<BUILD_INTERFACE:${Shapelib_SOURCE_DIR}>)
endif()
endif()
--
GitLab