[openscap] no absolute paths (#25838)

* [openscap] no absolute paths

* format

* x-add-version

* format

* x-add-version

Co-authored-by: LilyWangLL <v-lilywang@microsoft.com>
This commit is contained in:
autoantwort 2022-07-21 00:29:47 +02:00 committed by GitHub
parent 84541b3c07
commit 7fe8b4a85d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 12 deletions

View File

@ -14,15 +14,15 @@ if ("python" IN_LIST FEATURES)
endif() endif()
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
docs ENABLE_DOCS FEATURES
tests ENABLE_TESTS docs ENABLE_DOCS
util ENABLE_OSCAP_UTIL tests ENABLE_TESTS
python ENABLE_PYTHON3 util ENABLE_OSCAP_UTIL
python ENABLE_PYTHON3
) )
vcpkg_configure_cmake( vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS ${FEATURE_OPTIONS} OPTIONS ${FEATURE_OPTIONS}
-DPYTHON_EXECUTABLE=${PYTHON3} -DPYTHON_EXECUTABLE=${PYTHON3}
-DENABLE_PERL=OFF -DENABLE_PERL=OFF
@ -37,11 +37,12 @@ vcpkg_configure_cmake(
-DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON
) )
vcpkg_install_cmake() vcpkg_cmake_install()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig()
#Handle copyright #Handle copyright
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,9 +1,10 @@
{ {
"name": "openscap", "name": "openscap",
"version": "1.3.1", "version": "1.3.1",
"port-version": 2, "port-version": 3,
"description": "The oscap program is a command line tool that allows users to load, scan, validate, edit, and export SCAP documents.", "description": "The oscap program is a command line tool that allows users to load, scan, validate, edit, and export SCAP documents.",
"homepage": "https://github.com/OpenSCAP/openscap", "homepage": "https://github.com/OpenSCAP/openscap",
"license": "LGPL-2.1-or-later",
"dependencies": [ "dependencies": [
"curl", "curl",
"glib", "glib",
@ -14,6 +15,10 @@
"openssl", "openssl",
"pcre2", "pcre2",
"pthread", "pthread",
{
"name": "vcpkg-cmake",
"host": true
},
"zlib" "zlib"
], ],
"features": { "features": {

View File

@ -5246,7 +5246,7 @@
}, },
"openscap": { "openscap": {
"baseline": "1.3.1", "baseline": "1.3.1",
"port-version": 2 "port-version": 3
}, },
"openssl": { "openssl": {
"baseline": "3.0.5", "baseline": "3.0.5",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "6f96365cae0ee049b58b5863a0d59ca32782a9fa",
"version": "1.3.1",
"port-version": 3
},
{ {
"git-tree": "cbc6ed45cdfd68efd53ee939bed2440e2971730f", "git-tree": "cbc6ed45cdfd68efd53ee939bed2440e2971730f",
"version": "1.3.1", "version": "1.3.1",