diff options
| author | ankurverma85 <31362771+ankurverma85@users.noreply.github.com> | 2021-03-25 13:28:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-25 13:28:42 -0700 |
| commit | 5a10163c44526b5d42a67480ce7a692a36948761 (patch) | |
| tree | c62543931827cad6fddf592e41b05a162cdd075e /ports/osg | |
| parent | c2e1d32c25c77a258e103e00d778f6d935b44e73 (diff) | |
| download | vcpkg-5a10163c44526b5d42a67480ce7a692a36948761.tar.gz vcpkg-5a10163c44526b5d42a67480ce7a692a36948761.zip | |
[osgearth] Fix x64-windows-static-md (#15375)
* osgearth:x64-windows-static-md fixes
* Try to build for x64-windows-static-md
* Fix builds
* Indent and combine blocks
* overwrite version
* merge with master and update version
* revert incorrect version changes
* [osgearth] Improve portfile.cmake, add feature tools
* update version record
* disable fontconfig on windows
* update version
* [osgearth] Fix dependencies
* [osgearth] Re-fix dependencies
* [osgearth] Fix the sequence of linking osg
* [osgearth] Fix dependency osg
* update version record
* Fix osgearth:x64-linux
* x64-windows-static-md fixes
* Fix x64-linux
* Build fixes
* Update x-add-version
Co-authored-by: ankurv <ankurv@microsoft.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Diffstat (limited to 'ports/osg')
| -rw-r--r-- | ports/osg/CONTROL | 2 | ||||
| -rw-r--r-- | ports/osg/portfile.cmake | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ports/osg/CONTROL b/ports/osg/CONTROL index 8d453c36c..a05f5abe7 100644 --- a/ports/osg/CONTROL +++ b/ports/osg/CONTROL @@ -1,6 +1,6 @@ Source: osg Version: 3.6.5 -Port-Version: 6 +Port-Version: 7 Homepage: https://github.com/openscenegraph/OpenSceneGraph Description: The OpenSceneGraph is an open source high performance 3D graphics toolkit. Build-Depends: zlib, fontconfig (!windows), expat (windows), openimageio (osx) diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake index eaa94c2dd..b8aeaa712 100644 --- a/ports/osg/portfile.cmake +++ b/ports/osg/portfile.cmake @@ -54,6 +54,11 @@ if (VCPKG_TARGET_IS_WINDOWS AND OSG_DYNAMIC) endif() list(APPEND OPTIONS -DENABLE_NVTT=${ENABLE_NVTT}) +if (VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_FONTCONFIG=ON) + list(APPEND OPTIONS -DOSG_TEXT_USE_FONTCONFIG=OFF) +endif() + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS tools BUILD_OSG_APPLICATIONS examples BUILD_OSG_EXAMPLES |