From 28b10395532036c0e327dd43951b8e72257c395e Mon Sep 17 00:00:00 2001 From: Thorsten Hater <24411438+thorstenhater@users.noreply.github.com> Date: Mon, 3 Jun 2024 08:53:26 +0200 Subject: [PATCH] Use shared libs for CI to please delocate. :sigh: --- CMakeLists.txt | 6 ++++++ arbor/network.cpp | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b96e2ca24..d5585603b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -407,6 +407,12 @@ if(${Python3_FOUND}) message(STATUS "PYTHON_EXECUTABLE: ${PYTHON_EXECUTABLE}") endif() +# Shared / Dynamic? +# If set from outside, use that. +# If we are in wheel mode, default to shared for Python reasons. +if(NOT DEFINED BUILD_SHARED_LIBS) + set(BUILD_SHARED_LIBS ${DEFINED ENV{CIBUILDWHEEL}} CACHE STRING "Build shared libraries?") +endif() # Threading model #----------------- diff --git a/arbor/network.cpp b/arbor/network.cpp index 5c71973c4e..1d6a08ffe8 100644 --- a/arbor/network.cpp +++ b/arbor/network.cpp @@ -11,8 +11,6 @@ #include #include #include -#include -#include #include #include "backends/rand_impl.hpp"