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

[osg] Fix feature plugin #13942

Merged
merged 5 commits into from
Oct 12, 2020
Merged

[osg] Fix feature plugin #13942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5c94048
[osg] Fix feature plugin
Oct 9, 2020
3242bb3
test
Oct 9, 2020
c2e24f2
[osg] Fix dependency coin
Oct 9, 2020
f57e3b4
[coin] Add dependency opengl-registry
Oct 9, 2020
9cf7d8c
forgot to upload patch
Oct 10, 2020
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
3 changes: 2 additions & 1 deletion ports/coin/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
Source: coin
Version: 4.0.0
Port-Version: 1
Description: A high-level 3D visualization library with Open Inventor 2.1 API
Build-Depends: boost-assert, boost-config, boost-lexical-cast, boost-math, boost-smart-ptr, boost-static-assert
Build-Depends: boost-assert, boost-config, boost-lexical-cast, boost-math, boost-smart-ptr, boost-static-assert, opengl-registry
Homepage: https://github.com/coin3d/coin
Default-Features: simage, zlib
Supports: !(arm|arm64|uwp)
Expand Down
4 changes: 2 additions & 2 deletions ports/osg/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: osg
Version: 3.6.5
Port-Version: 1
Port-Version: 2
Homepage: https://github.com/openscenegraph/OpenSceneGraph
Description: The OpenSceneGraph is an open source high performance 3D graphics toolkit.
Build-Depends: zlib, fontconfig, boost-asio (!windows), boost-core (!windows), boost-logic (!windows), boost-lexical-cast (!windows), boost-smart-ptr (!windows), boost-tuple (!windows), boost-bind (!windows), freeglut (windows), expat (windows), openimageio (osx)
Expand All @@ -19,7 +19,7 @@ Build-Depends: freetype, sdl1, sdl2, libiconv (windows)

Feature: plugins
Description: Build OSG Plugins - Disable for compile testing examples on a time limit
Build-Depends: freetype, sdl1, curl, openexr, ilmbase, gdal, giflib (windows), jasper, libjpeg-turbo, libpng, tiff, libxml2 (windows), libiconv (windows), libgta, liblas, nvtt
Build-Depends: freetype, sdl1, curl, openexr, ilmbase, gdal, giflib (windows), jasper, libjpeg-turbo, libpng, tiff, libxml2 (windows), libiconv (windows), libgta, liblas, nvtt, coin

Feature: packages
Description: Set to ON to generate CPack configuration files and packaging targets
Expand Down
29 changes: 29 additions & 0 deletions ports/osg/fix-dependency-coin.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 798b8b9..c975d78 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -740,7 +740,7 @@ ELSE()
# Common to all platforms except android:
FIND_PACKAGE(Freetype)
FIND_PACKAGE(ilmbase)
- FIND_PACKAGE(Inventor)
+ FIND_PACKAGE(coin CONFIG)
Comment on lines +9 to +10
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Inventor is a part of coin.

FIND_PACKAGE(Jasper)
FIND_PACKAGE(OpenEXR)
FIND_PACKAGE(OpenCascade)
diff --git a/src/osgPlugins/Inventor/CMakeLists.txt b/src/osgPlugins/Inventor/CMakeLists.txt
index 963a494..e34b6b8 100644
--- a/src/osgPlugins/Inventor/CMakeLists.txt
+++ b/src/osgPlugins/Inventor/CMakeLists.txt
@@ -17,10 +17,6 @@ SET(TARGET_HDRS
ShuttleCallback.h
)

-ADD_DEFINITIONS(-DCOIN_DLL)
-
-INCLUDE_DIRECTORIES(${INVENTOR_INCLUDE_DIR})
-
-SET(TARGET_ADDED_LIBRARIES ${INVENTOR_LIBRARY})
+SET(TARGET_ADDED_LIBRARIES Coin::Coin)

SETUP_PLUGIN(iv iv)
1 change: 1 addition & 0 deletions ports/osg/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ vcpkg_from_github(
fix-liblas.patch
fix-nvtt.patch
use-boost-asio.patch
fix-dependency-coin.patch
)

if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
Expand Down
2 changes: 1 addition & 1 deletion ports/osgearth/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: osgearth
Version: 3.0
Port-Version: 1
Port-Version: 2
Homepage: https://github.com/gwaldron/osgearth
Description: osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2015 Pelican Mapping.
Build-Depends: osg[plugins]