Skip to content

Commit

Permalink
[osg] Disable conditional plugins. (#21634)
Browse files Browse the repository at this point in the history
Resolves nightly CI failure:
```
       "D:\buildtrees\osg\x86-windows-dbg\install.vcxproj" (default target) (1) ->
       "D:\buildtrees\osg\x86-windows-dbg\ALL_BUILD.vcxproj" (default target) (3) ->
       "D:\buildtrees\osg\x86-windows-dbg\src\osgPlugins\OpenCASCADE\osgdb_opencascade.vcxproj" (default target) (54) ->
       (ClCompile target) ->
         D:\buildtrees\osg\src\raph-3.6.5-0028e69d98.clean\src\osgPlugins\OpenCASCADE\ReaderWriterOpenCASCADE.cpp(214,49): error C2039: 'Nodes': is not a member of 'Poly_Triangulation' [D:\buildtrees\osg\x86-windows-dbg\src\osgPlugins\OpenCASCADE\osgdb_opencascade.vcxproj]
```

DICOM disabled because there's a check for dcmtk which isn't a dependency of osg[plugins]

Inventor disabled because there's a check for this library.

Opencascade disabled because it's broken.

All others disabled because they were behind some kind of if (XXX_found) in src\osgPlugins\CMakeLists.tx, except, Quicktime left alone because that's part of MacOS?
  • Loading branch information
BillyONeal committed Nov 23, 2021
1 parent 6130197 commit 70ebc32
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 2 deletions.
16 changes: 16 additions & 0 deletions ports/osg/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,28 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
docs BUILD_REF_DOCS_TAGFILE
)

set(BUILD_OSG_PLUGIN_RESTHTTPDEVICE ON)
if(VCPKG_TARGET_IS_WINDOWS)
set(BUILD_OSG_PLUGIN_RESTHTTPDEVICE OFF)
endif()

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS ${FEATURE_OPTIONS}
-DOSG_USE_UTF8_FILENAME=${OSG_USE_UTF8_FILENAME}
-DDYNAMIC_OPENSCENEGRAPH=${OSG_DYNAMIC}
-DDYNAMIC_OPENTHREADS=${OSG_DYNAMIC}
-DBUILD_OSG_PLUGIN_DICOM=OFF
-DBUILD_OSG_PLUGIN_OPENCASCADE=OFF
-DBUILD_OSG_PLUGIN_INVENTOR=OFF
-DBUILD_OSG_PLUGIN_FBX=OFF
-DBUILD_OSG_PLUGIN_DIRECTSHOW=OFF
-DBUILD_OSG_PLUGIN_QTKIT=OFF
-DBUILD_OSG_PLUGIN_SVG=OFF
-DBUILD_OSG_PLUGIN_VNC=OFF
-DBUILD_OSG_PLUGIN_LUA=OFF
-DBUILD_OSG_PLUGIN_RESTHTTPDEVICE=${BUILD_OSG_PLUGIN_RESTHTTPDEVICE}
-DBUILD_OSG_PLUGIN_ZEROCONFDEVICE=OFF
-DBUILD_DASHBOARD_REPORTS=OFF
-DCMAKE_CXX_STANDARD=11
${OPTIONS}
Expand Down
2 changes: 1 addition & 1 deletion ports/osg/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "osg",
"version-string": "3.6.5",
"port-version": 10,
"port-version": 11,
"description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.",
"homepage": "https://github.com/openscenegraph/OpenSceneGraph",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5058,7 +5058,7 @@
},
"osg": {
"baseline": "3.6.5",
"port-version": 10
"port-version": 11
},
"osg-qt": {
"baseline": "Qt5",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/osg.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "456c4454eee9f4a24916992b0870067f703ef374",
"version-string": "3.6.5",
"port-version": 11
},
{
"git-tree": "233201eee3ebfaaac75ba9696d12209e9a1fbc32",
"version-string": "3.6.5",
Expand Down

0 comments on commit 70ebc32

Please sign in to comment.