diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-10-12 09:28:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-12 09:28:49 -0700 |
| commit | 37c412ae073056d6295c0aeaecc1b625f77c612f (patch) | |
| tree | e132953e3bf2a94e1cbd373f8b293703fa3663ac /ports/osg | |
| parent | 3714469e0e928b06e20dde2473b90bac9c505368 (diff) | |
| download | vcpkg-37c412ae073056d6295c0aeaecc1b625f77c612f.tar.gz vcpkg-37c412ae073056d6295c0aeaecc1b625f77c612f.zip | |
[osg] Fix feature plugin (#13942)
Diffstat (limited to 'ports/osg')
| -rw-r--r-- | ports/osg/CONTROL | 4 | ||||
| -rw-r--r-- | ports/osg/fix-dependency-coin.patch | 29 | ||||
| -rw-r--r-- | ports/osg/portfile.cmake | 1 |
3 files changed, 32 insertions, 2 deletions
diff --git a/ports/osg/CONTROL b/ports/osg/CONTROL index 95e839688..a63ea9b47 100644 --- a/ports/osg/CONTROL +++ b/ports/osg/CONTROL @@ -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) @@ -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 diff --git a/ports/osg/fix-dependency-coin.patch b/ports/osg/fix-dependency-coin.patch new file mode 100644 index 000000000..b04318683 --- /dev/null +++ b/ports/osg/fix-dependency-coin.patch @@ -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) + 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) diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake index 332359122..14fe42168 100644 --- a/ports/osg/portfile.cmake +++ b/ports/osg/portfile.cmake @@ -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") |