[packages/netgen-mesher] - explicitly list libraries to link, cmake is so clueless ;/
baggins
baggins at pld-linux.org
Sat Dec 28 20:15:11 CET 2024
commit 8f7880d2e6accc6fb8c347423ea1405d2c412880
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Dec 28 20:59:04 2024 +0100
- explicitly list libraries to link, cmake is so clueless ;/
link-libraries.patch | 36 +++++++++++++++++-------------------
1 file changed, 17 insertions(+), 19 deletions(-)
---
diff --git a/link-libraries.patch b/link-libraries.patch
index 4bce838..33d9fc1 100644
--- a/link-libraries.patch
+++ b/link-libraries.patch
@@ -1,23 +1,21 @@
diff -rupN --no-dereference netgen-6.2.2406/CMakeLists.txt netgen-6.2.2406-new/CMakeLists.txt
--- netgen-6.2.2406/CMakeLists.txt 2024-12-03 18:26:11.119472907 +0100
+++ netgen-6.2.2406-new/CMakeLists.txt 2024-12-03 18:26:11.383465621 +0100
-@@ -252,6 +252,7 @@ set_target_properties(nglib PROPERTIES V
- if(USE_GUI)
- add_library(nggui ${NGGUI_LIBRARY_TYPE})
- set_target_properties(nggui PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR})
-+ target_link_libraries(nggui PRIVATE ${JPEG_LIBRARIES} ${FFMPEG_LIBRARIES})
+@@ -296,7 +296,7 @@
+ target_include_directories(netgen_gui INTERFACE ${TK_INCLUDE_PATH}/../xlib)
+ endif()
+
+- target_link_libraries(nggui PUBLIC nglib togl PRIVATE "$<BUILD_INTERFACE:netgen_python>" )
++ target_link_libraries(nggui PUBLIC nglib togl jpeg avcodec avformat avutil swscale PRIVATE "$<BUILD_INTERFACE:netgen_python>" )
+
if(WIN32)
- set_target_properties( nggui PROPERTIES OUTPUT_NAME "libnggui")
- endif(WIN32)
-diff -rupN --no-dereference netgen-6.2.2406/ng/CMakeLists.txt netgen-6.2.2406-new/ng/CMakeLists.txt
---- netgen-6.2.2406/ng/CMakeLists.txt 2024-12-03 18:26:11.376465814 +0100
-+++ netgen-6.2.2406-new/ng/CMakeLists.txt 2024-12-03 18:26:11.384465593 +0100
-@@ -23,7 +23,7 @@ if(USE_GUI)
- if(WIN32)
- target_sources(netgen PRIVATE ../windows/netgen.rc)
- endif(WIN32)
-- target_link_libraries( netgen nglib nggui netgen_python netgen_gui)
-+ target_link_libraries( netgen nglib nggui netgen_python netgen_gui ${JPEG_LIBRARIES} ${FFMPEG_LIBRARIES})
- install(TARGETS netgen ${NG_INSTALL_DIR})
- if(APPLE)
- set_target_properties(netgen PROPERTIES OUTPUT_NAME netgen)
+ target_compile_definitions(netgen_gui INTERFACE -DTOGL_WGL)
+@@ -633,7 +633,7 @@
+ file( WRITE "netgen_mesher-py3.egg-info"
+ "Metadata-Version: 2.1
+ Name: netgen-mesher
+-Version: ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR}.${NETGEN_VERSION_PATCH}.post${NETGEN_VERSION_TWEAK}
++Version: ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR}.${NETGEN_VERSION_PATCH}
+ ")
+ install(FILES netgen_mesher-py3.egg-info DESTINATION ${NG_INSTALL_DIR_PYTHON} COMPONENT netgen)
+ endif()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/netgen-mesher.git/commitdiff/8f7880d2e6accc6fb8c347423ea1405d2c412880
More information about the pld-cvs-commit
mailing list