mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 04:53:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[osg] Fix build for release-only triplets (#33885)

Browse Source
This commit is contained in:
Connor Broyles 2023-09-20 13:27:18 -04:00 committed by GitHub
parent 4c6db587c4
commit febeb3f7e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ports/osg/portfile.cmake
View File

@ -136,10 +136,12 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-osg)
# Add debug folder prefix for plugin targets. vcpkg_cmake_config_fixup only handles this for targets in bin/ and lib/.
set(osg_plugins_debug_targets "${CURRENT_PACKAGES_DIR}/share/unofficial-osg/osg-plugins-debug.cmake")
file(READ "${osg_plugins_debug_targets}" contents)
string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${_IMPORT_PREFIX}" contents "${contents}")
string(REPLACE "\${_IMPORT_PREFIX}/plugins" "\${_IMPORT_PREFIX}/debug/plugins" contents "${contents}")
file(WRITE "${osg_plugins_debug_targets}" "${contents}")
if(EXISTS "${osg_plugins_debug_targets}")
file(READ "${osg_plugins_debug_targets}" contents)
string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${_IMPORT_PREFIX}" contents "${contents}")
string(REPLACE "\${_IMPORT_PREFIX}/plugins" "\${_IMPORT_PREFIX}/debug/plugins" contents "${contents}")
file(WRITE "${osg_plugins_debug_targets}" "${contents}")
endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(APPEND "${CURRENT_PACKAGES_DIR}/include/osg/Config" "#ifndef OSG_LIBRARY_STATIC\n#define OSG_LIBRARY_STATIC 1\n#endif\n")

2
ports/osg/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "osg",
"version": "3.6.5",
"port-version": 21,
"port-version": 22,
"description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.",
"homepage": "https://www.openscenegraph.com/",
"license": null,

2
versions/baseline.json
View File

@ -6242,7 +6242,7 @@
},
"osg": {
"baseline": "3.6.5",
"port-version": 21
"port-version": 22
},
"osg-qt": {
"baseline": "Qt5",

5
versions/o-/osg.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "27f28ccf9745bc2ca1757d5fa32b92373c176e2a",
"version": "3.6.5",
"port-version": 22
},
{
"git-tree": "6e9d4d04aae606c5ac02c497b17774d37e74de7a",
"version": "3.6.5",