diff --git a/models/model_calvetti_py/model_calvetti_py.h b/models/model_calvetti_py/model_calvetti_py.h index 6b099466d9..70943feeb3 100644 --- a/models/model_calvetti_py/model_calvetti_py.h +++ b/models/model_calvetti_py/model_calvetti_py.h @@ -557,7 +557,7 @@ class Model_model_calvetti_py : public amici::Model_DAE { * @return AMICI git commit hash */ std::string get_amici_commit() const override { - return "20b07e9a8c19bdb7bf94a562f61b3d08dc0299d0"; + return "63f2e78a186ee722a79b0da2797e0c116ec81065"; } bool has_quadratic_llh() const override { diff --git a/models/model_calvetti_py/swig/CMakeLists.txt b/models/model_calvetti_py/swig/CMakeLists.txt index 314996c479..a4f2efa81f 100644 --- a/models/model_calvetti_py/swig/CMakeLists.txt +++ b/models/model_calvetti_py/swig/CMakeLists.txt @@ -44,8 +44,8 @@ if(NOT "${PY_EXT_SUFFIX}" STREQUAL "") endif() -swig_link_libraries(${SWIG_LIBRARY_NAME} - ${Python3_LIBRARIES} +target_link_libraries(${SWIG_LIBRARY_NAME} + Python3::Module model) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.py diff --git a/models/model_dirac_py/model_dirac_py.h b/models/model_dirac_py/model_dirac_py.h index 03813080e4..a03fcf9d77 100644 --- a/models/model_dirac_py/model_dirac_py.h +++ b/models/model_dirac_py/model_dirac_py.h @@ -544,7 +544,7 @@ class Model_model_dirac_py : public amici::Model_ODE { * @return AMICI git commit hash */ std::string get_amici_commit() const override { - return "20b07e9a8c19bdb7bf94a562f61b3d08dc0299d0"; + return "63f2e78a186ee722a79b0da2797e0c116ec81065"; } bool has_quadratic_llh() const override { diff --git a/models/model_dirac_py/swig/CMakeLists.txt b/models/model_dirac_py/swig/CMakeLists.txt index 314996c479..a4f2efa81f 100644 --- a/models/model_dirac_py/swig/CMakeLists.txt +++ b/models/model_dirac_py/swig/CMakeLists.txt @@ -44,8 +44,8 @@ if(NOT "${PY_EXT_SUFFIX}" STREQUAL "") endif() -swig_link_libraries(${SWIG_LIBRARY_NAME} - ${Python3_LIBRARIES} +target_link_libraries(${SWIG_LIBRARY_NAME} + Python3::Module model) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.py diff --git a/models/model_events_py/model_events_py.h b/models/model_events_py/model_events_py.h index f45acb4632..16fde1877b 100644 --- a/models/model_events_py/model_events_py.h +++ b/models/model_events_py/model_events_py.h @@ -579,7 +579,7 @@ class Model_model_events_py : public amici::Model_ODE { * @return AMICI git commit hash */ std::string get_amici_commit() const override { - return "20b07e9a8c19bdb7bf94a562f61b3d08dc0299d0"; + return "63f2e78a186ee722a79b0da2797e0c116ec81065"; } bool has_quadratic_llh() const override { diff --git a/models/model_events_py/swig/CMakeLists.txt b/models/model_events_py/swig/CMakeLists.txt index 314996c479..a4f2efa81f 100644 --- a/models/model_events_py/swig/CMakeLists.txt +++ b/models/model_events_py/swig/CMakeLists.txt @@ -44,8 +44,8 @@ if(NOT "${PY_EXT_SUFFIX}" STREQUAL "") endif() -swig_link_libraries(${SWIG_LIBRARY_NAME} - ${Python3_LIBRARIES} +target_link_libraries(${SWIG_LIBRARY_NAME} + Python3::Module model) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.py diff --git a/models/model_jakstat_adjoint_py/model_jakstat_adjoint_py.h b/models/model_jakstat_adjoint_py/model_jakstat_adjoint_py.h index 78e73fdb02..bdad8fe252 100644 --- a/models/model_jakstat_adjoint_py/model_jakstat_adjoint_py.h +++ b/models/model_jakstat_adjoint_py/model_jakstat_adjoint_py.h @@ -552,7 +552,7 @@ class Model_model_jakstat_adjoint_py : public amici::Model_ODE { * @return AMICI git commit hash */ std::string get_amici_commit() const override { - return "20b07e9a8c19bdb7bf94a562f61b3d08dc0299d0"; + return "63f2e78a186ee722a79b0da2797e0c116ec81065"; } bool has_quadratic_llh() const override { diff --git a/models/model_jakstat_adjoint_py/swig/CMakeLists.txt b/models/model_jakstat_adjoint_py/swig/CMakeLists.txt index 314996c479..a4f2efa81f 100644 --- a/models/model_jakstat_adjoint_py/swig/CMakeLists.txt +++ b/models/model_jakstat_adjoint_py/swig/CMakeLists.txt @@ -44,8 +44,8 @@ if(NOT "${PY_EXT_SUFFIX}" STREQUAL "") endif() -swig_link_libraries(${SWIG_LIBRARY_NAME} - ${Python3_LIBRARIES} +target_link_libraries(${SWIG_LIBRARY_NAME} + Python3::Module model) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.py diff --git a/models/model_nested_events_py/model_nested_events_py.h b/models/model_nested_events_py/model_nested_events_py.h index c5ca495059..8f19547b87 100644 --- a/models/model_nested_events_py/model_nested_events_py.h +++ b/models/model_nested_events_py/model_nested_events_py.h @@ -552,7 +552,7 @@ class Model_model_nested_events_py : public amici::Model_ODE { * @return AMICI git commit hash */ std::string get_amici_commit() const override { - return "20b07e9a8c19bdb7bf94a562f61b3d08dc0299d0"; + return "63f2e78a186ee722a79b0da2797e0c116ec81065"; } bool has_quadratic_llh() const override { diff --git a/models/model_nested_events_py/swig/CMakeLists.txt b/models/model_nested_events_py/swig/CMakeLists.txt index 314996c479..a4f2efa81f 100644 --- a/models/model_nested_events_py/swig/CMakeLists.txt +++ b/models/model_nested_events_py/swig/CMakeLists.txt @@ -44,8 +44,8 @@ if(NOT "${PY_EXT_SUFFIX}" STREQUAL "") endif() -swig_link_libraries(${SWIG_LIBRARY_NAME} - ${Python3_LIBRARIES} +target_link_libraries(${SWIG_LIBRARY_NAME} + Python3::Module model) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.py diff --git a/models/model_neuron_py/model_neuron_py.h b/models/model_neuron_py/model_neuron_py.h index be4e45f9e1..8f27330f47 100644 --- a/models/model_neuron_py/model_neuron_py.h +++ b/models/model_neuron_py/model_neuron_py.h @@ -574,7 +574,7 @@ class Model_model_neuron_py : public amici::Model_ODE { * @return AMICI git commit hash */ std::string get_amici_commit() const override { - return "20b07e9a8c19bdb7bf94a562f61b3d08dc0299d0"; + return "63f2e78a186ee722a79b0da2797e0c116ec81065"; } bool has_quadratic_llh() const override { diff --git a/models/model_neuron_py/swig/CMakeLists.txt b/models/model_neuron_py/swig/CMakeLists.txt index 314996c479..a4f2efa81f 100644 --- a/models/model_neuron_py/swig/CMakeLists.txt +++ b/models/model_neuron_py/swig/CMakeLists.txt @@ -44,8 +44,8 @@ if(NOT "${PY_EXT_SUFFIX}" STREQUAL "") endif() -swig_link_libraries(${SWIG_LIBRARY_NAME} - ${Python3_LIBRARIES} +target_link_libraries(${SWIG_LIBRARY_NAME} + Python3::Module model) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.py diff --git a/models/model_robertson_py/model_robertson_py.h b/models/model_robertson_py/model_robertson_py.h index 05b27a6c80..30b1078026 100644 --- a/models/model_robertson_py/model_robertson_py.h +++ b/models/model_robertson_py/model_robertson_py.h @@ -536,7 +536,7 @@ class Model_model_robertson_py : public amici::Model_DAE { * @return AMICI git commit hash */ std::string get_amici_commit() const override { - return "20b07e9a8c19bdb7bf94a562f61b3d08dc0299d0"; + return "63f2e78a186ee722a79b0da2797e0c116ec81065"; } bool has_quadratic_llh() const override { diff --git a/models/model_robertson_py/swig/CMakeLists.txt b/models/model_robertson_py/swig/CMakeLists.txt index 314996c479..a4f2efa81f 100644 --- a/models/model_robertson_py/swig/CMakeLists.txt +++ b/models/model_robertson_py/swig/CMakeLists.txt @@ -44,8 +44,8 @@ if(NOT "${PY_EXT_SUFFIX}" STREQUAL "") endif() -swig_link_libraries(${SWIG_LIBRARY_NAME} - ${Python3_LIBRARIES} +target_link_libraries(${SWIG_LIBRARY_NAME} + Python3::Module model) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.py diff --git a/models/model_steadystate_py/model_steadystate_py.h b/models/model_steadystate_py/model_steadystate_py.h index f1ce69e448..c7d6c7f0af 100644 --- a/models/model_steadystate_py/model_steadystate_py.h +++ b/models/model_steadystate_py/model_steadystate_py.h @@ -536,7 +536,7 @@ class Model_model_steadystate_py : public amici::Model_ODE { * @return AMICI git commit hash */ std::string get_amici_commit() const override { - return "20b07e9a8c19bdb7bf94a562f61b3d08dc0299d0"; + return "63f2e78a186ee722a79b0da2797e0c116ec81065"; } bool has_quadratic_llh() const override { diff --git a/models/model_steadystate_py/swig/CMakeLists.txt b/models/model_steadystate_py/swig/CMakeLists.txt index 314996c479..a4f2efa81f 100644 --- a/models/model_steadystate_py/swig/CMakeLists.txt +++ b/models/model_steadystate_py/swig/CMakeLists.txt @@ -44,8 +44,8 @@ if(NOT "${PY_EXT_SUFFIX}" STREQUAL "") endif() -swig_link_libraries(${SWIG_LIBRARY_NAME} - ${Python3_LIBRARIES} +target_link_libraries(${SWIG_LIBRARY_NAME} + Python3::Module model) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.py diff --git a/python/sdist/amici/exporters/sundials/templates/CMakeLists_model.cmake b/python/sdist/amici/exporters/sundials/templates/CMakeLists_model.cmake index 314996c479..a4f2efa81f 100644 --- a/python/sdist/amici/exporters/sundials/templates/CMakeLists_model.cmake +++ b/python/sdist/amici/exporters/sundials/templates/CMakeLists_model.cmake @@ -44,8 +44,8 @@ if(NOT "${PY_EXT_SUFFIX}" STREQUAL "") endif() -swig_link_libraries(${SWIG_LIBRARY_NAME} - ${Python3_LIBRARIES} +target_link_libraries(${SWIG_LIBRARY_NAME} + Python3::Module model) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.py