Dirk Stoecker
64c3907f1f
- Restore Retrieve-required-flags-from-Libnest2D-target.patch, which is not upstream, and rebase. This fixes building for Leap 15.3 and 15.4. OBS-URL: https://build.opensuse.org/request/show/960592 OBS-URL: https://build.opensuse.org/package/show/science/python3-pynest2d?expand=0&rev=12
39 lines
1.9 KiB
Diff
39 lines
1.9 KiB
Diff
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")
|
|
endif()
|
|
|
|
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 CONFIG COMPONENTS libnest2d_headeronly) # The library we're creating bindings for.
|
|
|
|
# Some build options.
|
|
set(CMAKE_CXX_STANDARD 17)
|
|
@@ -45,5 +41,5 @@ set(SIP_EXTRA_FILES_DEPEND
|
|
)
|
|
|
|
set(SIP_EXTRA_OPTIONS -g -n PyQt5.sip) # Always release the GIL before calling C++ methods. -n PyQt5.sip is required to not get the PyCapsule error
|
|
-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)
|