Skip to content

Commit

Permalink
Remove -fvisibility=hidden and -fvisibility-inlines-hidden flags
Browse files Browse the repository at this point in the history
  • Loading branch information
JeanChristopheMorinPerso committed Nov 24, 2024
1 parent 519c960 commit 6f159fe
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
with:
Expand Down
34 changes: 22 additions & 12 deletions patch.patch
Original file line number Diff line number Diff line change
@@ -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>
$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
-Wno-unused-value>
+ $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
+ -sDISABLE_EXCEPTION_CATCHING=0>
$<$<CXX_COMPILER_ID:MSVC>: /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}")

0 comments on commit 6f159fe

Please sign in to comment.