[soqt] no absolute paths (#22325)

This commit is contained in:
autoantwort 2022-01-06 22:35:56 +01:00 committed by GitHub
parent eb21a77630
commit 1067658476
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 15 deletions

View File

@ -1,4 +1,3 @@
vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm" "arm64")
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
@ -31,27 +30,23 @@ vcpkg_from_github(
HEAD_REF master HEAD_REF master
) )
if(NOT EXISTS ${SOURCE_PATH}/src/Inventor/Qt/common) if(NOT EXISTS "${SOURCE_PATH}/src/Inventor/Qt/common")
file(RENAME "${SOGUI_SOURCE_PATH}" "${SOURCE_PATH}/src/Inventor/Qt/common") file(RENAME "${SOGUI_SOURCE_PATH}" "${SOURCE_PATH}/src/Inventor/Qt/common")
endif() endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL static) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SOQT_BUILD_SHARED_LIBS)
set(SOQT_BUILD_SHARED_LIBS OFF)
else()
set(SOQT_BUILD_SHARED_LIBS ON)
endif()
vcpkg_configure_cmake( vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS OPTIONS
-DSOQT_BUILD_DOCUMENTATION=OFF -DSOQT_BUILD_DOCUMENTATION=OFF
-DSOQT_BUILD_SHARED_LIBS=${SOQT_BUILD_SHARED_LIBS} -DSOQT_BUILD_SHARED_LIBS=${SOQT_BUILD_SHARED_LIBS}
) )
vcpkg_install_cmake() vcpkg_cmake_install()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/SoQt-1.6.0) vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SoQt-1.6.0)
vcpkg_fixup_pkgconfig()
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

View File

@ -1,7 +1,7 @@
{ {
"name": "soqt", "name": "soqt",
"version-string": "1.6.0", "version": "1.6.0",
"port-version": 3, "port-version": 4,
"description": "A Qt Gui-toolkit binding for Coin", "description": "A Qt Gui-toolkit binding for Coin",
"homepage": "https://github.com/coin3d/soqt", "homepage": "https://github.com/coin3d/soqt",
"supports": "!(arm | arm64 | uwp)", "supports": "!(arm | arm64 | uwp)",
@ -10,6 +10,14 @@
{ {
"name": "qt5-base", "name": "qt5-base",
"default-features": false "default-features": false
},
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
} }
] ]
} }

View File

@ -6470,7 +6470,7 @@
}, },
"soqt": { "soqt": {
"baseline": "1.6.0", "baseline": "1.6.0",
"port-version": 3 "port-version": 4
}, },
"sord": { "sord": {
"baseline": "0.16.4", "baseline": "0.16.4",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "25bc0ce4eb1212df1f9110770fbf02157a21bccd",
"version": "1.6.0",
"port-version": 4
},
{ {
"git-tree": "3bbb3ea4c3dff6485e3d04f6af1fbbe6e5a75be9", "git-tree": "3bbb3ea4c3dff6485e3d04f6af1fbbe6e5a75be9",
"version-string": "1.6.0", "version-string": "1.6.0",