Update SBMLNetwork; fix zlib link. Hopefully.

sys-bio · Jan 16, 2025 · b59fe36 · b59fe36
1 parent d4247c4
commit b59fe36
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
@@ -9,7 +9,7 @@ set(EXTRA_INCLUDE_DIRS "${EXTRA_INCLUDE_DIRS}" "$<TARGET_PROPERTY:zlib,INCLUDE_D
 #message(STATUS "LIBZ_INCLUDE_DIR: ${LIBZ_INCLUDE_DIR}")
 message(STATUS "Extra include directories: ${EXTRA_INCLUDE_DIRS}")
 set(LIBZ_LIBRARY zlibstatic)
-add_library(ZLIB:ZLIB ALIAS zlibstatic)
+#add_library(ZLIB:ZLIB ALIAS zlibstatic)
 set(ZLIB_LIBRARY "$<TARGET_LINKER_FILE:zlibstatic>" CACHE FILEPATH "zlib static library" FORCE)
 
 # nleq1

diff --git a/third_party/SBMLNetwork b/third_party/SBMLNetwork
+1 −1		VERSION.txt
+50 −11		src/bindings/python/ctypes/libsbmlnetwork.py.cmake
+10 −4		src/bindings/python/ctypes/sbmlnetwork/src/sbmlnetwork/sbmlnetwork.py
+63 −1		src/bindings/python/ctypes/sbmlnetwork/tests/test_with_specific_models.py
+12 −0		src/c_api/libsbmlnetwork_c_api.cpp
+29 −1		src/c_api/libsbmlnetwork_c_api.h
+1 −1		src/features/alias_elements/libsbmlnetwork_alias_reaction.cpp
+14 −93		src/features/autolayout/libsbmlnetwork_autolayout.cpp
+1 −23		src/features/autolayout/libsbmlnetwork_autolayout.h
+4 −1		src/features/autolayout/libsbmlnetwork_autolayout_node.cpp
+41 −12		src/features/autolayout/libsbmlnetwork_fruchterman_reingold_algorithm.cpp
+2 −0		src/features/autolayout/libsbmlnetwork_fruchterman_reingold_algorithm.h
+4 −2		src/features/set_layout_features/libsbmlnetwork_set_layout_features.cpp
+2 −0		src/features/update_curves/libsbmlnetwork_update_curves.cpp
+15 −0		src/features/user_data/libsbmlnetwork_user_data.cpp
+2 −0		src/features/user_data/libsbmlnetwork_user_data.h
+5 −3		src/libsbmlnetwork_layout_helpers.cpp
+1 −1		src/libsbmlnetwork_layout_helpers.h
+8 −8		src/libsbmlnetwork_render.cpp
+12 −0		src/libsbmlnetwork_sbmldocument.cpp
+11 −0		src/libsbmlnetwork_sbmldocument.h
+9 −4		src/libsbmlnetwork_sbmldocument_layout.cpp
+2 −2		src/libsbmlnetwork_sbmldocument_layout.h