* [osg] Install plugins directly to plugins folder
This change removes the stage in portfile.cmake which relocates the osg plugins from bin/ to plugins/. Instead, the OsgMacroUtils.cmake file is patched to install directly to the plugins folder.
This has two primary effects. The first is correcting the exported target locations, as they still pointed to bin/ after moving the plugins. The second is fixing the process on non-Windows platforms, as the plugins were not being moved in those cases.
* update version
* update version
* update version
* [osg] Update version
* [osg] Update port version
* [osg] Fix port version
Co-authored-by: Jonliu1993 <13720414433@163.com>
* Update to 3.1.5
* Add feature 'tools'
* ilmbase is now imath
* [theia] Use openimageio cmake config
* [freeimage] Use OpenEXR 3 and Imath
* [opencv4] Use upstream's OpenEXR 3 support
* [opencv3] Use upstream's OpenEXR 3 support
* [opencv2] Use OpenEXR 3 and Imath
* [osg] Use OpenEXR 3
* [openvdb] Use Imath, enable OpenEXR
* [pangolin] Use OpenEXR 3
* [directxtex] Use OpenEXR 3
* [uvatlas] Disable /guard:ehcont when directxtex uses openexr
* Update versions
Co-authored-by: chausner <chausner@users.noreply.github.com>
* Don't depend on default features
* Use OpenEXR config
* Try to skip non-portable check_cxx_source_runs
* Ensure PKG_CONFIG_USE_CMAKE_PREFIX_PATH
* Use link libraries from pkg-config
* Revise feature-to-CMake mapping
* Update versions
* QT arm64-windows build (WIP)
* Updated versions
* Undo changes made to graphviz in error
* Only remove OpenGL for ARM
* Update version database
* Update version database
* updated libs not compatible with uwp+arm
* Update version database
* Enable QT in CI
* qt5-base not compat
* Update ports/qtapplicationmanager/vcpkg.json
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* Update ports/qt5-imageformats/vcpkg.json
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* Updated versions
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* Revise portfile
* Plugins are a default feature; fix disabling
* Remove line continuations from pc file
vcpkg_fixup_pkgconfig cannot handle it.
* Control nvtt plugin via feature
* Control dae plugin, not find_package
* Control fontconfig via feature
Use CMake's (3.14) find module for which vcpkg provides a wrapper.
OSG links to Fontconfig::Fontconfig.
OSG default is to use Fontconfig except for ios and android.
* Control freetype via feature
Use CMake's find module for which vcpkg provides a wrapper.
OSG links to FREETYPE_LIBRARIES.
* Control RestHttpDevice via feature
Only this plugin needs boost.
* Drop unused liblas dependency
* Drop unused coin dependency
Coin was meant to be used for the inventor plugin,
but this plugin is disabled.
* Control sdl1 via feature
* Enable apps on linux
* Disable apps and docs for debug
* Drop example application patch
* Use option, not patch, to disable DLL versioning
* Fix osg plugin PDB installation
* Prefer <Pkg>_LIBRARIES for linking
<Pkg>_LIBRARIES carries debug+release config and transitive usage requirements.
* Curl patches are obsolete now.
We leverage CURL_LIBRARIES via link-libraries.patch.
* Add unofficial config export
* Use toolchain's windows version
Fixes mingw build.
* Avoid extra dependency lookups
* Silence warnings about plugin control variables
* Define OSG_LIBRARY_STATIC
* Revise copying of plugins
* Control OpenEXR via feature
Unblock uwp.
* Allow jasper without opengl
* [osgearth] Remove obsolete geos patching
The build uses exported geos config.
* [osgearth] Serialize linking to avoid OOM errors
* [osgearth] Fix minor portfile issues
* [osgearth] Prefer <Pkg>_LIBRARIES for linking
<Pkg>_LIBRARIES carries debug+release config and transitive usage requirements.
* [osgearth] Use unofficial osg config
* [osgearth] Fix lib installation dir
* [osgearth] Revise OSGEARTH_LIBRARY_STATIC
* [osgearth] Revise find_package patching
* [osgearth] Revise copying of plugins
* [osgearth] Disable tools for debug variant
* [osgearth] Control Blend2D via feature
* Update versions
* Fix plugin lookup
* Update versions
* CR request
* Update versions
* [osgearth] Remove tools from default features
* Update versions
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?
* [many ports] call vcpkg_fixup_pkgconfig()
The ports generate pc files, but don't call vcpkg_fixup_pkgconfig() so that there are absolute paths in the pc files
* Update port-version for armadillo and polyclipping.
* Update version database.
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* [fontconfig] update fontconfig
* [libiconv] update to make
* [gettext] update to make
* [vcpkg_configure_make] Changes considering pure configure ports without the requirement to run autoconfig
* [fontconfig] make it work on windows
* Remove install of unofficial cmake config
* add function get_cmake_vars
* fine tuning.
* apply to make based ports.
* add log suffix on not windows platforms
* fix c&p error
* add previous LINK env
* setup env on windows and extract cpp flags correctly.
* update glib and libxml2
* fix windows regressions
* Apply suggestions from code review
* add windres wrapper to invoke RC.
* remove wrong fi
* fix libintl.
* try fixing uwp
* other things to update
* exiv2 fix
* libtool does not like -RTC1
* pass the /RTC<x> flag directly to the compiler
* trust cmake instead of adding extra flags
* fix expat
* fix iconv wrapper install
* change fontconfig intl linkage.
* add appcontainer back in which is required for UWP. Why is this not in the cmake flags?
* fix pkg-config in vcpkg_configure_make
* fix json-c pkg-config installation
* remove remnoved config
* comment out debug messages + bit of tuning
* finally fontconfig
* comment debug messages
* expat apply extra patches.
* Switch back to -E instead of -EP in cpp
* commit changes from fontconfig PR
* [expat] fix expat details
* Apply suggestions from code review
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
* cleanup docs
* update osx pipeline so that fontconfig actually builds
* fix expat the lazy way by using a higher commit than release
* fix a barage of regressions due to the use of unofficial targets
* [expat] use a higher commit hash with a better stabilized cmake build
* forgot freexl regression
* more unofficial fixes
* fix downstream expat usage
* fix wxwidgets
* fix gcdm regression
* [vtk] fix the regression due to expat
* add uwp cl flags back in. Somehow those are not set by cmake
* add a few other configure options for full gettext build
* fix cmake regression
* fix a few regressions
* fix static gettext build
* fix gettext static
* fix libxml2 wrapper for cmake
* some more regressions fixes
* add conversion from somelib.lib to -lsomelib
* add a few option to libiconv.
* get logs from CI
* add missing ar-lib wrapper
* add missing ar-lib wrapper
* add fatal error to gettext
* remove uuid from the list of LIBS since it seems to not exist in CI?
* small but important regex correction
* fix regex and add debug message for libs
* remove error and only build libintl.
* add uuid dependency to fontconfig in qt5-base
* osx install gettext for autopoint
* fix io2d regression by saying the port is broken .....
(which it is; upstream needs to learn proper cmake)
* restore the old libxml2 wrapper with minor modifications
* fix xmlsec regression
* install wrapper correctly
* try actual fixing io2d
* improve iconv wrapper
* add latest changes from update_fontconfig PR
* Apply suggestions from code review
first set which don't need special attention
Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
* Apply suggestions from code review
one more simple change
Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
* [x264] set env AS
* fix bugs due to refactor
* use subpath everywhere
* apply changes from CR
* fix fontconfig build.
* only change libs in static builds
* remove unnecessary lines 41 & 44
* remove flag transformation
* reintroduce the flag / to - transformation for MSVC
* trying to figure out autopoint issue.
using wrong (windows) find.exe instead of msys
* add correct working_dir to subpath
* escape stupid env paths.
* fix typo
* add findutils
remove debug messages
* add error if libtool chokes
* add file to msys
* pass lt_cv_deplibs_check_method=pass_all on windows
(couldn't get file.exe to work so that libtool correctly ids the passed libs)
* add bzip2 to msys
* reenable libtool check. Lets see if CI agrees
* unbreak linux
try to figure out where uuid should be on windows.
* add -L flag and help libtool ?
* try to get ci to find uuid.
* try to use cygpath
* update controls
* cleanup merge mistakes
* correct merge issues
* determine cmake vars if not done before.
* move adding of -l earlier
* more merge cleanup
* fix uwp builds by not transforming libs
* fix patches in io2d
* fix xz download error
* apply code review changes manually
* fix the typos left behind in CR
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
When asio and boost-asio are installed, osg's build scripts would choose the standalone version of asio, but uses features specific to boost-asio. This patch forces the port to always use boost-asio, as the original CONTROL file indicated was the intent.
Also fixed transitive dependencies not being declared that just happened to get installed because boost-asio is a dependency.
* [cmake] Update to 3.17.1
* update cmake directory name
* [cpuid] Fix install headers.
* [stormlib] Fix install headers
* [murmurhash] Fix install headers
* [metrohash] Fix install headers
* update baseline
* update baseline
* [otl] update hash
* update baseline
* [gts] Do not use ninja to avoid empty implib issue
* update baseline
* [dmlc] Re-trigger ci test
* [replxx] Re-trigger ci test
* update baseline
* [osg] Re-trigger ci test
* [replxx] Fix build failure
* Set cmake min version to 3.17.1
* update baseline
* [libnice] Re-trigger ci test
* [mlpack] Re-trigger ci test
* update to 3.17.2
* update cmake hash
* update baseline
* update baseline
* update baseline
* update baseline
* Update scripts/ci.baseline.txt
Co-authored-by: Billy O'Neal <billy.oneal@gmail.com>
* update baseline
* update baseline
* [magnum] Set magnum:arm64-windows to skip in baseline
* [nanogui] Set nanogui:arm64-windows to fail in baseline
* [nettle] Set nettle:x64-windows to fail, waiting for fix this issue in another PR
* re-trigger CI test
* update baseline
* Install unixODBC in Linux
* [nanodbc] Re-trigger CI test
* update baseline
* Remove space
* update baseline
* remove unfinished "supports" tag
* extract "supports" from control files
But do nothing with the value
* Start `Supports` documentation
* Use Supports in a bunch of control files
I only tried matching the already existing logic in the portfile.cmake.
* Cmake var provider (#8)
* Cmake var provider (#9)
* fix windows build (#10)
* Add missing files to build
* Fix test (#11)
* adding hooks for cmake variables in expressions
* Adding hooks for 'supports' in CI test
* Fix test (#12)
* Add overrides to evaluation environment
* use "supported" tag in CI testing
* cleanup comment
* Fix issues with PR
* [var_provider] Get library linkage variables from triplet
* Fix compilation errors in tests
* Add unimplemented functions
* Fix unit tests part 1
* Fix issue when buildtrees dir does not exist
* Change binary output hash
* Fix handling of * feature
* Add core feature when using *
* Do not add Default-Features when installing 'core'
* [vcpkg] WIP. 6 failing tests.
* [vcpkg] WIP. 1 failing tests.
* [vcpkg] WIP. 0 failing tests.
* [vcpkg] Removed 'remove_graph'. 0 failing tests.
* [vcpkg] Removed 'install_graph'. 0 failing tests.
* [vcpkg] Remove AnyAction; replace with ActionPlan
* [vcpkg] Minor cleanup.
* [vcpkg][z3][qt5-connectivity][qt5-purchasing] Improve error messages while parsing. Fix a few trivial port issues.
* [vcpkg] Work around ICE with MSVC v140
* [vcpkg] Add purge on fail to decompress for CI
* [vcpkg] Fix parsing of nested parentheses in qualifiers
* [vcpkg] Fix Linux builds (explicit qualification in declaration)
* [vcpkg] Fix Build-Depends implying default features. Fix qualified dependencies regression.
* [mmx] Add to skip list and full rebuild -- mmx causes problems by installing 'sched.h'
* [libpqxx][mqtt-cpp] Prevent installing include/CMakeLists.txt
* [cppitertools] Fix installed include namespace (should be include/cppitertools)
* [libsoundio] Move headers into soundio/ subdirectory as per original cmake
* [ci.baseline] Temporarily skip charls due to conflict with dcmtk
* [vcpkg] Add restricted include files post build check -- bump global abi version
* [libsoundio] Hotfix stray line in portfile
* [vcpkg] Fix regression: CMake information was not being displayed for build-and-install actions
* [jsonnet] Fix installation of internal headers; use system nlohmann-json
* [grpc][upb] Teach grpc to use packaged upb. Add find_package(upb). Remove inappropriate upb features.
* [zfp] Move problematic 'include/bitstream.h' to 'include/zfp/bitstream.h'
* [x265] Bump control version to trigger rebuild after zfp conflict
* [akali] Disable parallel configure
* [dirent][dlfcn-win32][getopt-win32][pthreads] Grandfather into VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS
* [ci.baseline] Update baseline for improved upb support
* [tgui] Disable parallel configure
* [libiconv] Enable VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS
* [aws-sdk-cpp] Disable parallel configure
* [vcpkg] Implement policy VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS
* [aws-sdk-cpp] Fix amount of escaping semicolons -- Note: I do not know the root cause requiring this change
* [libodb-sqlite] Fix configuring into source directory
* [gettext] Grandfather into VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS
* [libodb] DISABLE_PARALLEL_CONFIGURE
* [vcpkg] Add 'config.h' and 'local.h' to restricted header list
* [mcpp] Remove unused and problematic include 'config.h' from installed files
* [teemo] Move installed headers into subdirectory to prevent conflicts with x265
* [ci.baseline] Update current OSX. Skip libmesh on all platforms due to heavy conflicts.
* [vcpkg] Add 'slice.h' as a restricted header
* [osg] Improve accuracy of dependencies (disable some, add some to Depends)
* [vcpkg] Skip invoking a subprocess for 0 specs in load_tag_vars
* [ci.baseline] Skip mongo-c-driver on osx due to flakiness
* [teemo] Fix incorrect include file read
* [osg] Fix dependency typo: glut -> freeglut
* [vcpkg] Recover some lost performance with the addition of vcpkg_get_tags.
A huge performance cost was loading the triplet files over and over; instead, we splice the sources into a macro and load it once, then just call that macro for each port.
Remove use of hashing because we aren't cross-process-safe anyway (global static will do instead).
* [vcpkg] Change Supports atom 'windows' to include UWP. Improve Supports field documentation.
* [vcpkg] Add docs for VCPKG_ENV_PASSTHROUGH and VCPKG_DEP_INFO_OVERRIDE_VARS
* Fix typo
Co-authored-by: Curtis J Bezault <curtbezault@gmail.com>
Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>