File Retrieve-required-flags-from-Libnest2D-target.p... of Package python3-pynest2d

Overview Repositories Revisions Requests Users Attributes Meta

File Retrieve-required-flags-from-Libnest2D-target.patch of Package python3-pynest2d (Revision 5cc35e46536180a8969ca6cb3b0de1f7)

Currently displaying revision 5cc35e46536180a8969ca6cb3b0de1f7 , Show latest

From b5b587ff320fd5bb0155d6803a85804502210cca Mon Sep 17 00:00:00 2001
From: StefanBruens <stefan.bruens@rwth-aachen.de>
Date: Sun, 25 Oct 2020 15:59:56 +0100
Subject: [PATCH] Retrieve required flags from Libnest2D target

Instead of setting include paths and libs manually, just use the imported target.
All required properties are set Libnest2DTargets.cmake.

This also adds the otherwise missing libpthread to the link libraries.
---
 CMakeLists.txt | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8cd17da..5ccba47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,11 +10,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 find_package(PythonInterp 3.5 REQUIRED)  # Dependency of SIP.
 find_package(PythonLibs 3.5 REQUIRED)  # Dependency of SIP.
 find_package(SIP REQUIRED)  # To create Python bindings.
-find_package(libnest2d REQUIRED)  # The library we're creating bindings for.
-find_package(Clipper REQUIRED)  # Dependency of libnest2d.
-find_package(NLopt REQUIRED)  # Dependency of libnest2d.
-find_package(Boost REQUIRED)  # Dependency of libnest2d.
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLIBNEST2D_GEOMETRIES_clipper -DLIBNEST2D_OPTIMIZERS_nlopt -DLIBNEST2D_THREADING_std")  # Tell libnest2d to use Clipper and NLopt, and standard threads.
+find_package(Libnest2D REQUIRED)  # The library we're creating bindings for.
 
 # Some build options.
 set(CMAKE_CXX_STANDARD 11)
@@ -45,5 +41,5 @@ set(SIP_EXTRA_FILES_DEPEND
 )
 
 set(SIP_EXTRA_OPTIONS -g -n PyQt5.sip) # -g means always release the GIL before calling C++ methods.
-include_directories(src/ ${SIP_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS} ${CLIPPER_INCLUDE_DIRS} ${NLopt_INCLUDE_DIRS} ${LIBNEST2D_INCLUDE_DIRS})
-add_sip_python_module(pynest2d src/Pynest2D.sip ${CLIPPER_LIBRARIES} ${NLopt_LIBRARIES})
+include_directories(src/ ${SIP_INCLUDE_DIRS})
+add_sip_python_module(pynest2d src/Pynest2D.sip Libnest2D::libnest2d_headeronly)

Places

File Retrieve-required-flags-from-Libnest2D-target.patch of Package python3-pynest2d (Revision 5cc35e46536180a8969ca6cb3b0de1f7)

Places