From 6f159fe6dd2bbb93e45327b4d014c8606828abd0 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Morin Date: Sun, 24 Nov 2024 14:37:51 -0500 Subject: [PATCH] Remove -fvisibility=hidden and -fvisibility-inlines-hidden flags --- .github/workflows/deploy.yaml | 4 ++-- patch.patch | 34 ++++++++++++++++++++++------------ 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index e7ce160..e07394c 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -29,8 +29,8 @@ jobs: with: python-version: '3.12' - # - run: git apply < ../patch.patch - # working-directory: OpenTimelineIO + - run: git apply < ../patch.patch + working-directory: OpenTimelineIO - uses: pypa/cibuildwheel@v2.20.0 with: diff --git a/patch.patch b/patch.patch index 1df856e..c205fae 100644 --- a/patch.patch +++ b/patch.patch @@ -1,13 +1,23 @@ -diff --git a/src/py-opentimelineio/opentimelineio-bindings/CMakeLists.txt b/src/py-opentimelineio/opentimelineio-bindings/CMakeLists.txt -index d37da36..5559ce3 100644 ---- a/src/py-opentimelineio/opentimelineio-bindings/CMakeLists.txt -+++ b/src/py-opentimelineio/opentimelineio-bindings/CMakeLists.txt -@@ -34,6 +34,8 @@ target_compile_options(_otio PRIVATE - -Wno-range-loop-analysis> - $<$,$,$>: - -Wno-unused-value> -+ $<$,$,$>: -+ -sDISABLE_EXCEPTION_CATCHING=0> - $<$: /EHsc> - ) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fa74391..97c1c4e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -114,12 +114,12 @@ if(OTIO_SHARED_LIBS) + else() + message(STATUS "Building static libs") + set(OTIO_SHARED_OR_STATIC_LIB "STATIC") +- if (OTIO_PYTHON_INSTALL) +- # If we're compiling for pybind, we can hide all our symbols, they'll only be called from pybind +- # Note that this has no effect on Windows. +- set(CMAKE_CXX_VISIBILITY_PRESET hidden) +- set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) +- endif() ++ # if (OTIO_PYTHON_INSTALL) ++ # # If we're compiling for pybind, we can hide all our symbols, they'll only be called from pybind ++ # # Note that this has no effect on Windows. ++ # set(CMAKE_CXX_VISIBILITY_PRESET hidden) ++ # set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) ++ # endif() + endif() + set(OTIO_RESOLVED_CXX_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")