Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

additional magnum importer plugins in python build dependencies #2105

Merged
merged 4 commits into from
May 16, 2023
Merged

additional magnum importer plugins in python build dependencies #2105

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57375a2
add additional magnum importer plugins to python build dependencies
aclegg3 May 15, 2023
2344efb
refactor to reduce redundancy
aclegg3 May 15, 2023
138e934
remove StanfordImporter as it doesn't support ASCII ply.
aclegg3 May 16, 2023
b0c914c
Merge remote-tracking branch 'origin/main' into magnum-plugins-depend…
aclegg3 May 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions src/cmake/dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,16 +349,24 @@ if(NOT USE_SYSTEM_MAGNUM)
# Make Magnum text rendering plugins (used by the native viewer) available
# for Python as well; and reset that back to strange build procedures that
# turn some features off again later can still work.
set(
common_plugins
Magnum::AnyImageConverter
Magnum::AnyImageImporter
Magnum::AnySceneImporter
MagnumPlugins::AssimpImporter
MagnumPlugins::BasisImporter
MagnumPlugins::GltfImporter
MagnumPlugins::StbImageConverter
MagnumPlugins::StbImageImporter
)
if(BUILD_GUI_VIEWERS)
set(MAGNUM_PYTHON_BINDINGS_STATIC_PLUGINS
MagnumPlugins::StbTrueTypeFont Magnum::AnySceneImporter
MagnumPlugins::AssimpImporter CACHE STRING "" FORCE
)
else()
set(MAGNUM_PYTHON_BINDINGS_STATIC_PLUGINS Magnum::AnySceneImporter
MagnumPlugins::AssimpImporter
set(MAGNUM_PYTHON_BINDINGS_STATIC_PLUGINS ${common_plugins}
MagnumPlugins::StbTrueTypeFont
CACHE STRING "" FORCE
)
else()
set(MAGNUM_PYTHON_BINDINGS_STATIC_PLUGINS ${common_plugins} CACHE STRING "" FORCE)
endif()
add_subdirectory("${DEPS_DIR}/magnum-bindings")
endif()
Expand Down